summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git50
1 files changed, 38 insertions, 12 deletions
diff --git a/.DEPS.git b/.DEPS.git
index eec9820..ce43778 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':
- '@bb1bf0f1273ab1ad09e594afb1866a6008bbb234',
'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':
- '@1d858e714e5444aa5a08215e9d4920b62b980e17'
+ '@1d858e714e5444aa5a08215e9d4920b62b980e17',
+ 'angle_revision':
+ '19f363a963a8ab85f798bdd9072251171b96b900'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@d37ba8fc45dd38d202ef4dd0a76c01854614dcd1',
+ '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@f14633beee7e5f54267a84ef6745f16862338f82',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@54c00059758cb4e83085f71eff73e546ea61d8a0',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@955a3e2590806aaa7dbc978c07d8f22f10e5c092',
+ 'src':
+ Var('git_url') + '/chromium/src.git@e52267353ac78f99955b5add631a74ad01eb1543',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@f3f050cd97ad86fac2700ef9ca98bd9f0319d304',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -38,17 +58,17 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a6772271f71672e889776bfe49ec4efd9da036df',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('git_url') + '/external/WebKit_trimmed.git' + 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@19f363a963a8ab85f798bdd9072251171b96b900',
+ 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@4520925ab0a4a7af163e46a22008e40b0e5e7735',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@6da952826bdecf712bced91d7b8a38e818aa063c',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@78a2e692ecce084e1bb2cd6fde2d44eae2045f0b',
'src/third_party/hunspell':
@@ -315,7 +335,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@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':
@@ -329,8 +349,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@b25c350b74905d16e2b3b397ade1c36c6afb852b',
+ '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/cros_dbus_cplusplus/source':
Var('git_url') + '/chromiumos/third_party/dbus-cplusplus.git@5e8f6d9db5c2abfb91d91f751184f25bb5cd0900',
'src/third_party/cros_system_api':
@@ -353,9 +379,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':