summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git54
1 files changed, 43 insertions, 11 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 29c2aa8..4c7cd19 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':
- '@cc796f43aa0528f3d10bc853cc52af30acab618c',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@0bd198bdf2c5fd768459f2eeb852606a56355b9c'
+ '@2e36af3bf88838a7d260495f3a22ffb3504e8cac',
+ 'angle_revision':
+ '4a3734a39070c419edc9a153288bce030f226897'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@6600388f773495f034ffde70520086d1520824c8',
+ '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@1cd786e71623a99319ae4813c90fd5774650282a',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@de8922d7ed255bcd81f348b69688a8ce5dcfcf1b',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@e7ceaadef10a356bd3c37ca0b5d2db655337adc3',
+ 'src':
+ Var('git_url') + '/chromium/src.git@d978b1d3caa7afbdc89ddd752956ead33afdcad6',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@6a72f3664181eef15566323399694fc35c28834a',
'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') + '@27d5c553e4467e6171d32ba744a925f644f08c76',
'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@4a3734a39070c419edc9a153288bce030f226897',
+ 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@c1f7ac8238380b95ad4664a08afd10568a3bdc20',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@020251fa94208069efd68c84322cb19b11e7c54f',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@78a2e692ecce084e1bb2cd6fde2d44eae2045f0b',
'src/third_party/hunspell':
@@ -235,6 +257,10 @@ 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@43154f7003469696f4e323bdd56536a99eb846fa',
+ 'src/third_party/WebKit/Source/WebKit/chromium/public':
+ Var('git_url') + '/external/WebKit/Source/WebKit/chromium/public.git@da64b3cf0ea5fd4ffe707509f598d27459264bcd',
'src/third_party/WebKit/Tools/DumpRenderTree':
None,
'src/third_party/WebKit/Tools/Scripts':
@@ -311,7 +337,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@fc81b2f6c3854189fe67d388daab67a0383b78aa',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@1f3578bb9c3cfdf1293f106f07e5b0b3e19ae543',
'src/third_party/lighttpd':
@@ -325,8 +351,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@ae8022ad3cc34b49dffe4a384e73a6728404dbfa',
+ '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@b4f1f61dfee5efbf9577ffade74767a6659eeb2a',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@848d591953f69426080f8a5f29130897bd6fc73d',
'src/third_party/cros_dbus_cplusplus/source':
@@ -355,9 +387,9 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@59d06b4c3e4bb53b342b41ab804bf5f2b1ff2807',
+ 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/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':