summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git56
1 files changed, 43 insertions, 13 deletions
diff --git a/.DEPS.git b/.DEPS.git
index e840447b..b31e46b 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':
- '@4ece657f9dad6a37e7b7e3584eb8887aad4dc499',
'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':
- '@82c333acb918025baf02af92c80855e5d32a9663'
+ '@82c333acb918025baf02af92c80855e5d32a9663',
+ 'angle_revision':
+ '001470bb5bff47d1f3f68943a45bf53803a2b623'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@8215e9862a692b35450b429b0e3edb3ca909698c',
+ '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@5ece0953c2b4eebcc9011d94e41588229fc9de9b',
+ 'build/scripts/private/data/reliability':
+ Var('git_url') + '/chromium/src.git@48f85e445b0182015140038745c3896b13404b9e',
+ 'build/third_party/gsutil':
+ Var('git_url') + '/external/gsutil/src.git@3ae724bed3c59a309fa87acc7e6b745c6e555e2f',
+ 'build/third_party/lighttpd':
+ Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+ 'chromeos':
+ Var('git_url') + '/chromium/src.git@ed711943b09ea4b6a21b4b3cc0f66e00178009c1',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@5266e1fecd9ce13fa3c5443ca08e6a8641db84cb',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@c30dc5911b0700de72d8de9b238666c9aa8114b7',
+ 'src':
+ Var('git_url') + '/chromium/src.git@1a790837b7e5f816a3eea27acb02607a28798b0c',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@48dacdd69b47b921447e3e6cda71ffc849b1c6fa',
'src/build/util/support':
@@ -42,15 +62,15 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@361c8fbbc15e74730908e28660cb742eba046a83',
'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@001470bb5bff47d1f3f68943a45bf53803a2b623',
+ 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@f21333128a69c2e06c910137784bcce30d589342',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@b059bf7fb0d535cfa139efb4c8e0ede1c609c405',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@2ba6d0b1b74de09ae4b1f04399127b4aaa20e070',
'src/third_party/hunspell':
@@ -143,7 +163,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/rlz':
Var('git_url') + '/external/rlz.git@c6536c5beb689d1ebb8997b97d76f8797ba067c7',
'src/third_party/GTM':
@@ -159,8 +179,18 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git',
+ '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':
+ 'http://git.chromium.org/chromiumos/platform/cros.git@377f51d8',
+ 'src/third_party/cros_system_api':
+ 'http://git.chromium.org/chromiumos/platform/system_api.git@a6f845e1',
'src/third_party/gold':
Var('git_url') + '/chromium/deps/gold.git@44ab2e796b8126864b4860eb108dbf5068887063',
'src/third_party/lss':
@@ -175,9 +205,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/rlz':
Var('git_url') + '/external/rlz.git@c6536c5beb689d1ebb8997b97d76f8797ba067c7',
'src/third_party/cygwin':