summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git37
1 files changed, 25 insertions, 12 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 713e1b7..97663f8 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,15 +1,24 @@
-# DO NOT EDIT. THIS IS A GENERATED FILE.
+# 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/UsingGit
+# FOR HOW TO ROLL DEPS
vars = {
'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':
- '@6971f0312202760e68d57d36471fec5039295704'
+ '@6971f0312202760e68d57d36471fec5039295704',
+ 'angle_revision':
+ 'ade79b8f746e42d8730924e4d96eba0401afc7de'
}
deps = {
+ 'chromeos':
+ Var('git_url') + '/chromium/src.git@93d529cafc6423e431a88612dff69d06d4f0759f',
+ 'src':
+ Var('git_url') + '/chromium/src.git@334aca8423a9b45336b9fce15491c3efee3745ea',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@513b1e5a04c1e29b41855e092de2c1ff4860a693',
'src/build/util/support':
@@ -31,9 +40,9 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a2965825b1953c7b8ad292f726eb5c3f2659d5d3',
'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@ade79b8f746e42d8730924e4d96eba0401afc7de',
+ 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':
@@ -87,7 +96,7 @@ deps = {
'src/third_party/v8-i18n':
Var('git_url') + '/external/v8-i18n.git@8b6c2f831db1ac1420f088c83b0393077fb99b9a',
'src/third_party/webdriver/python/selenium':
- Var('git_url') + '/external/selenium/py/selenium.git@cefac3ebde838c842521ab8d0ff2540a42ecb82f',
+ Var('git_url') + '/external/selenium/py.git@43dd2f3b684a129cdaf84e4e4e0656e2d7852a4c',
'src/third_party/webgl_conformance':
Var('git_url') + '/chromium/deps/webgl/sdk/tests.git@610d3f4a4dc6a233bd95bc50cbc36174150866ee',
'src/third_party/webrtc':
@@ -97,7 +106,7 @@ deps = {
'src/tools/grit':
Var('git_url') + '/external/grit-i18n.git@1bbdba89a09dd2cbdde21a2dd0dc39a5e3263fda',
'src/tools/gyp':
- Var('git_url') + '/external/gyp.git@5cf3fcf76f9579db7638a4489f4a12314fcc729d',
+ Var('git_url') + '/external/gyp.git@24ab002e4da1a23547cfe42ff4d7145c1537d1c0',
'src/tools/page_cycler/acid3':
Var('git_url') + '/chromium/deps/acid3.git@633fc66cc99ae5bb92b567c6beafde7a01cfdb49',
'src/v8':
@@ -110,7 +119,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@dde16d147a5b8d0229f8adf8eee6d180fb9f4684',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@370bfbfa0a7f3177da752965cd63d3b377d742fb',
'src/third_party/lighttpd':
@@ -125,7 +134,11 @@ deps_os = {
'unix':
{
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux.git@30e720f6bfd2be52c37307114b6fca8817a90562',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
+ 'src/third_party/cros':
+ 'http://git.chromium.org/chromiumos/platform/cros.git@b48469c4',
+ 'src/third_party/cros_system_api':
+ 'http://git.chromium.org/chromiumos/platform/system_api.git@8152d9bd',
'src/third_party/lss':
Var('git_url') + '/external/linux-syscall-support/lss.git@92bafa4c45f03a440868c5e2f066ef61e6f4c517',
'src/third_party/openssl':
@@ -138,9 +151,9 @@ deps_os = {
'win':
{
'src/chrome/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/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@9e6b5c3990e1c24f19cff445362d0a2d5ee2bd2f',
'src/third_party/cygwin':