summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git59
1 files changed, 38 insertions, 21 deletions
diff --git a/.DEPS.git b/.DEPS.git
index fb6a6e7..df3d9d2 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,19 +1,32 @@
-# DO NOT EDIT. THIS IS A GENERATED FILE.
+# DO NOT EDIT EXCEPT FOR LOCAL TESTING.
+# THIS IS A GENERATED FILE.
# ALL MANUAL CHANGES WILL BE OVERWRITTEN.
+# SEE http://code.google.com/p/chromium/wiki/UsingGit
+# FOR HOW TO ROLL DEPS
vars = {
'webkit_url':
- 'http://git.chromium.org/external/WebKit_trimmed.git',
+ 'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
- 'http://git.chromium.org',
+ 'https://chromium.googlesource.com',
'webkit_rev':
- '@7a3e3e733f14ea1ee6527a88bc07ff212eb76322'
+ '@593529640a196baecbf61987e6bd48c2930fec19',
+ 'angle_revision':
+ '42925a990eaab1de97e1edbd8af78d32bb634aa0'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@0f9cf75d3a0760402e96eb4e30c6e888a44f1c65',
+ 'chromeos':
+ Var('git_url') + '/chromium/src.git@93d529cafc6423e431a88612dff69d06d4f0759f',
+ 'src':
+ Var('git_url') + '/chromium/src.git@fb6f3988713252620d89ed79ad34f8b07cd67b26',
'src/breakpad/src':
- Var('git_url') + '/external/google-breakpad/src.git@513b1e5a04c1e29b41855e092de2c1ff4860a693',
+ Var('git_url') + '/external/google-breakpad/src.git@70c3f5d304bfde6494c140aecbc329dd566a5a7d',
'src/build/util/support':
Var('git_url') + '/chromium/support.git@9306628dc48b26b6264fc32a09bd5f926fec7218',
+ 'src/chrome/browser/resources/software_rendering_list':
+ Var('git_url') + '/chromium/deps/gpu/software_rendering_list.git@5c486a4e41965789dcb25190502ddd815afd73f9',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
Var('git_url') + '/native_client/src/native_client/tests/prebuilt.git@3e17365176c94624f46cace174f61834b7f3c35d',
'src/chrome/test/data/perf/frame_rate/content':
@@ -21,7 +34,7 @@ deps = {
'src/googleurl':
Var('git_url') + '/external/google-url.git@290665e5ec3f648c6d94f0a4e2d0f1c603f65b84',
'src/native_client':
- Var('git_url') + '/native_client/src/native_client.git@bf121d5d1aeb2c63779a8a54689f5589f01af980',
+ Var('git_url') + '/native_client/src/native_client.git@e01979743f7327660e983658505cadc2d4a5966b',
'src/sdch/open-vcdiff':
Var('git_url') + '/external/open-vcdiff.git@64fe2324403ea78dbd781073f4e5b34768676e2c',
'src/seccompsandbox':
@@ -31,15 +44,15 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a2965825b1953c7b8ad292f726eb5c3f2659d5d3',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('git_url') + '/external/WebKit_trimmed.git' + Var('webkit_rev'),
'src/third_party/angle':
- Var('git_url') + '/external/angleproject.git@ade79b8f746e42d8730924e4d96eba0401afc7de',
+ Var('git_url') + '/external/angleproject.git' + '@' + Var('angle_revision'),
'src/third_party/bidichecker':
Var('git_url') + '/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
'src/third_party/cacheinvalidation/files/src/google':
Var('git_url') + '/external/google-cache-invalidation-api/src/google.git@b638a24e0215731f1c0c3bd2c77f110f49a11305',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/deps/ffmpeg/source.git@e8ac1facccc87c64fb1863b00a170bab9deea4cd',
+ Var('git_url') + '/chromium/deps/ffmpeg/source.git@0edb2b126dcae90730e450afdeb0eec0112ce84b',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@1cde08e295604898d14367eda0414ade8121ec43',
'src/third_party/hunspell':
@@ -85,9 +98,9 @@ deps = {
'src/third_party/swig/Lib':
Var('git_url') + '/chromium/deps/swig/Lib.git@549f0b084ad9c40ef42d111303d831eb8d91252e',
'src/third_party/v8-i18n':
- Var('git_url') + '/external/v8-i18n.git@8b6c2f831db1ac1420f088c83b0393077fb99b9a',
+ Var('git_url') + '/external/v8-i18n.git@a7613b045cd4a1172348cff8a2a49d43995bb283',
'src/third_party/webdriver/python/selenium':
- Var('git_url') + '/external/selenium/py/selenium.git@cefac3ebde838c842521ab8d0ff2540a42ecb82f',
+ Var('git_url') + '/external/selenium/py.git@43dd2f3b684a129cdaf84e4e4e0656e2d7852a4c',
'src/third_party/webgl_conformance':
Var('git_url') + '/chromium/deps/webgl/sdk/tests.git@610d3f4a4dc6a233bd95bc50cbc36174150866ee',
'src/third_party/webrtc':
@@ -101,7 +114,7 @@ deps = {
'src/tools/page_cycler/acid3':
Var('git_url') + '/chromium/deps/acid3.git@633fc66cc99ae5bb92b567c6beafde7a01cfdb49',
'src/v8':
- Var('git_url') + '/external/v8/3.6.git@ee0e6d1ff114d6f139499a64df306f661682f767',
+ Var('git_url') + '/external/v8.git@8f41c6e8752d5aa09d3866fd8793a589381103d3',
}
deps_os = {
@@ -110,7 +123,7 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@604fa85cc4e214aa0f418a2596ea865c0eed7a54',
'src/chrome/tools/test/reference_build/chrome_mac':
- Var('git_url') + '/chromium/reference_builds/chrome_mac.git@dde16d147a5b8d0229f8adf8eee6d180fb9f4684',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@370bfbfa0a7f3177da752965cd63d3b377d742fb',
'src/third_party/lighttpd':
@@ -125,7 +138,11 @@ deps_os = {
'unix':
{
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux.git@30e720f6bfd2be52c37307114b6fca8817a90562',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
+ 'src/third_party/cros':
+ 'http://git.chromium.org/chromiumos/platform/cros.git@b48469c4',
+ 'src/third_party/cros_system_api':
+ 'http://git.chromium.org/chromiumos/platform/system_api.git@8152d9bd',
'src/third_party/lss':
Var('git_url') + '/external/linux-syscall-support/lss.git@92bafa4c45f03a440868c5e2f066ef61e6f4c517',
'src/third_party/openssl':
@@ -138,15 +155,15 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@b9f52667918a74977cb85eefd4e967150f852fbc',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/chrome_frame/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@b9f52667918a74977cb85eefd4e967150f852fbc',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/rlz':
Var('git_url') + '/external/rlz.git@9e6b5c3990e1c24f19cff445362d0a2d5ee2bd2f',
'src/third_party/cygwin':
Var('git_url') + '/chromium/deps/cygwin.git@06a117a90c15174436bfa20ceebbfdf43b7eb820',
'src/third_party/ffmpeg/binaries/chromium/win/ia32':
- Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@8c079a1f740562eaf5986ce7bbe887de5a0351ad',
+ Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@8e77945c998b1899c30bb1ea6fbf2973017af00e',
'src/third_party/lighttpd':
Var('git_url') + '/chromium/deps/lighttpd.git@856e79c6109d4f0abe93c01d4c22419e33c9bee7',
'src/third_party/mingw-w64/mingw/bin':
@@ -198,17 +215,17 @@ hooks = [
'python',
'src/build/download_nacl_toolchains.py',
'--x86-version',
- '6757',
+ '6941',
'--nacl-newlib-only',
'--file-hash',
'mac_x86_newlib',
- '280ecee659ff804d5eeca8964c31545b0d68d9c8',
+ 'da76f48d57b1e579e2a2e65fdfd9c03136b46e24',
'--file-hash',
'win_x86_newlib',
- '7730f4515c745c0c012df4a1080be9a46ffcda47',
+ 'b6318df6af3e6bda15c8bf8aa373bb4fd1b6bd63',
'--file-hash',
'linux_x86_newlib',
- '596aa5b812ec4b24160ed7ce55b3fd141f929fbf'
+ 'd1001bba03ab37a7aab3c295da5660c5b7c45a98'
],
'pattern':
'.'