summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git50
1 files changed, 39 insertions, 11 deletions
diff --git a/.DEPS.git b/.DEPS.git
index f4c1491..ddf6406 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/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@8f024ae8c1508482d94ce2a40027a944e1784c02'
+ '@3a008dec7250f3226a66888778e3985cc736ce79',
+ 'angle_revision':
+ '4ef9942d7b9a35571ab7e357679aa8619910aa95'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@0b2f7420d55d7fb1525b686b16ec3f706abd54f2',
+ '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@a169734c7886d6fe5c636d8e71f54fea49f7b690',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@847d2ca4ca5f4356e92f40fb24198b3c7ec600d0',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@7d5cc1b424487447006a7cad9bee4c272b1e15e3',
+ 'src':
+ Var('git_url') + '/chromium/src.git@41b7e9ce3de77fb1877ad2e44e71b8a0e925b6a0',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@ce68292c66da6fd4be2ce6f2574fcbf457a80010',
'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') + '@3a008dec7250f3226a66888778e3985cc736ce79',
'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@4ef9942d7b9a35571ab7e357679aa8619910aa95',
+ 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@bc9909a19023b305b288dd36d016331cf4e2cc62',
'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':
@@ -321,7 +343,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@1f3578bb9c3cfdf1293f106f07e5b0b3e19ae543',
'src/third_party/lighttpd':
@@ -335,8 +357,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@127dac71742804d6d6bd9f91a56c6550971547d2',
+ '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':
@@ -365,9 +393,9 @@ 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/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':