summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git154
1 files changed, 133 insertions, 21 deletions
diff --git a/.DEPS.git b/.DEPS.git
index d3edff0..6dfbc7c 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,20 +1,40 @@
# 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/UsingNewGit
+# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@54b4fe19d390794c895226f7d014cd4deff24293',
'webkit_url':
- 'https://chromium.googlesource.com/external/WebKit_trimmed.git',
+ 'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@69fbb66dab245458ca95d9a3257863e7ccc8a228'
+ '@9bc0bed2a3f4d91f01cbba73cdb13657cc6b82d3',
+ 'angle_revision':
+ '92582404964958304600f9a597a092ad42f30436'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@fe552baabfb76d27bd444c473a8a78d09f45567e',
+ 'build/scripts/command_wrapper/bin':
+ Var('git_url') + '/chromium/tools/command_wrapper/bin.git@2eeebba9a512cae9e4e9312f5ec728dbdad80bd0',
+ 'build/scripts/gsd_generate_index':
+ Var('git_url') + '/chromium/tools/gsd_generate_index.git@d2f5d5a5d212d8fb337d751c0351644a6ac83ac8',
+ 'build/scripts/private/data/reliability':
+ Var('git_url') + '/chromium/src.git@acfbc85e2980a8f596194dd8c0f49cbdc3860a5b',
+ 'build/third_party/gsutil':
+ Var('git_url') + '/external/gsutil/src.git@5cba434b828da428a906c8197a23c9ae120d2636',
+ 'build/third_party/lighttpd':
+ Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+ 'build/third_party/swarm_client':
+ Var('git_url') + '/chromium/tools/swarm_client.git@46e61cc616283e16404a4c8786100dec755c97a1',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@12137021252afdf859f9fb7c23e03698f75229d5',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@43e34f0ba8a7a5bd57175a0d11a31a13f99edc90',
+ 'src':
+ Var('git_url') + '/chromium/src.git@2cb31ab374c833f8cd1ab4b93f4033c4407caab5',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@f3f050cd97ad86fac2700ef9ca98bd9f0319d304',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -25,6 +45,8 @@ deps = {
Var('git_url') + '/chromium/frame_rate/content.git@c10272c88463efeef6bb19c9ec07c42bc8fe22b9',
'src/chrome/test/data/perf/third_party/octane':
Var('git_url') + '/external/octane-benchmark.git@9ac27bfd9e0bc73663db0c0551440215d8b20d09',
+ 'src/content/test/data/layout_tests':
+ Var('webkit_url') + '@bf4bc619705e020c17b453f79383082cd85ecf60',
'src/googleurl':
Var('git_url') + '/external/google-url.git@8debb9b26bab1b66e9b28a58447338eca544765d',
'src/native_client':
@@ -38,17 +60,17 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a6772271f71672e889776bfe49ec4efd9da036df',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('webkit_url') + '' + Var('webkit_rev'),
'src/third_party/accessibility-developer-tools':
Var('git_url') + '/external/accessibility-developer-tools.git@ad5df9a5341d38778658c90e4aa241c4ebe4e8aa',
'src/third_party/angle':
- Var('git_url') + '/external/angleproject.git@eb78f6c676337aa6bf1ee6c8a8120ddfd1184d5f',
+ 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/src':
Var('git_url') + '/external/google-cache-invalidation-api/src.git@708704be0504025f66cbd98fcd1e752f11c6253b',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@ad7a777c64de7d76053b7a717098255553aee667',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@78a2e692ecce084e1bb2cd6fde2d44eae2045f0b',
'src/third_party/hunspell':
@@ -98,11 +120,11 @@ deps = {
'src/third_party/sfntly/cpp/src':
Var('git_url') + '/external/sfntly/cpp/src.git@cfb2f1743f0169ad8d01035458617bce97107539',
'src/third_party/skia/gyp':
- Var('git_url') + '/external/skia/gyp.git@a7febdfdebdbeab74d10020a8661a17fd116b9ce',
+ Var('git_url') + '/external/skia/gyp.git@3526cd2ff03052bf0403e2822998bff08a7157eb',
'src/third_party/skia/include':
- Var('git_url') + '/external/skia/include.git@b89f52e475b73634e663a4ee074c9a6379430ffc',
+ Var('git_url') + '/external/skia/include.git@1188f7498554bae62fc49d423965aab9b4bd5c02',
'src/third_party/skia/src':
- Var('git_url') + '/external/skia/src.git@733215b47938c309241b257f34a11f932029aefd',
+ Var('git_url') + '/external/skia/src.git@9284f82b9f1038e0d364da117cc62734d51580d4',
'src/third_party/smhasher/src':
Var('git_url') + '/external/smhasher.git@e813f9b95be7adad5a2e441f4484278c453e5261',
'src/third_party/snappy/src':
@@ -124,7 +146,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@5dffb5f7dc1557ff6abdb1b99bbbf98fedee3a14',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/stable/webrtc.git@8660ceb74ad27538fd2b6a4dfcdf62731c3d2eae',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@da4b4961a6d0ed45a61f41ec926e5793464e7047',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -138,7 +160,7 @@ deps = {
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@a1133cf617ef7adf12168e62494b98772bad0b6b',
'src/v8':
- Var('git_url') + '/external/v8.git@91efda9680c1eac04b6babfbf812d79b7df3747a',
+ Var('git_url') + '/external/v8.git@fd2dfc07c273fd4ddce0f27f01eca995cabb1ed7',
'src/webkit/media/crypto/ppapi/cdm':
Var('git_url') + '/chromium/cdm.git@c2b192a02546916d28233cfd8b7717ffcdcc8347',
}
@@ -146,6 +168,50 @@ deps = {
deps_os = {
'android':
{
+ 'src/content/test/data/layout_tests/LayoutTests/editing/pasteboard/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/files':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/filesystem':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/js/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/appcache':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/media':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/files':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/indexeddb':
+ None,
+ 'src/third_party/WebKit/LayoutTests':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@02d3db3c400baa959883006dc697c6cbd70c5194',
'src/third_party/aosp':
@@ -237,10 +303,6 @@ deps_os = {
None,
'src/third_party/WebKit/Source':
None,
- 'src/third_party/WebKit/Source/Platform/chromium/public':
- Var('git_url') + '/external/WebKit/Source/Platform/chromium/public.git@b64d103aff116d210dd1dda7d26f5597611b93f7',
- 'src/third_party/WebKit/Source/WebKit/chromium/public':
- Var('git_url') + '/external/WebKit/Source/WebKit/chromium/public.git@25e1e01321f0e1ddee90e2e4f3e2d0fca2e92ec9',
'src/third_party/WebKit/Tools/DumpRenderTree':
None,
'src/third_party/WebKit/Tools/Scripts':
@@ -319,7 +381,7 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@dd8415469606fe7bfdc2ebc12b8457b912ede326',
'src/chrome/tools/test/reference_build/chrome_mac':
- Var('git_url') + '/chromium/reference_builds/chrome_mac.git@b43b0539e14bf908e771dbbf0b080f7dc9b75219',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@6ea10b5e00258b98e91a9c9067f524c3e2cda252',
'src/third_party/lighttpd':
@@ -333,8 +395,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@057327296194216841b56baf107d32d488f7eef3',
+ 'build/third_party/xvfb':
+ Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
+ 'build/xvfb':
+ Var('git_url') + '/chromium/tools/xvfb.git@077af3535e54dbb782a355b81ba69ea17ec6bde5',
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux.git@53d4cfaf7032086779f2f4f40a9b6f21b7dbc3bf',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@1d8a25be640e27cbac454995239cd71f34b5f613',
'src/third_party/cros_dbus_cplusplus/source':
@@ -363,9 +431,53 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@fc239c7dcabcd2a225c281963eedb6a5441fb13b',
+ 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/content/test/data/layout_tests/LayoutTests/editing/pasteboard/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/files':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/filesystem':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/js/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/appcache':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/resources':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/media':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/files':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/domstorage':
+ None,
+ 'src/content/test/data/layout_tests/LayoutTests/storage/indexeddb':
+ None,
+ 'src/third_party/WebKit/LayoutTests':
+ None,
'src/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':