summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git45
1 files changed, 30 insertions, 15 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 641cc5a..77d8d0b 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,17 +1,26 @@
-# 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':
- '@bef2b50c773e7f340f235f8f4c09d4cd5729536b'
+ '@1993f15501e6b861b22fb11d96a560b69935016a',
+ 'angle_revision':
+ '337f08184c986d06fe1748f334d654772457c6c3'
}
deps = {
+ 'chromeos':
+ Var('git_url') + '/chromium/src.git@dc510524de71411c79cae4bf47684be32a0514a0',
+ 'src':
+ Var('git_url') + '/chromium/src.git@15f86a283b880ff360feac5624c6c27ce1e06604',
'src/breakpad/src':
- Var('git_url') + '/external/google-breakpad/src.git@e75ea59dc9b5a85ddf785a6024291e104e7c700a',
+ Var('git_url') + '/external/google-breakpad/src.git@56ce4d8cf284bbf5be7a58055d00c6c97232e3f6',
'src/build/util/support':
Var('git_url') + '/chromium/support.git@9306628dc48b26b6264fc32a09bd5f926fec7218',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -31,15 +40,15 @@ 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@e235cce5deca28e84eff830862a09a2f8f845dbc',
+ 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@2bd4562d201c4e0426771543ddaf4bdc16f91d6e',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/deps/ffmpeg/source.git@d745b0723009d052cbf1db5f7502974d540148b4',
+ Var('git_url') + '/chromium/deps/ffmpeg/source.git@1b92ff364c0a989f6e4a402c8f4ac03a80aaea3d',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@1cde08e295604898d14367eda0414ade8121ec43',
'src/third_party/hunspell':
@@ -78,6 +87,8 @@ deps = {
Var('git_url') + '/external/skia/src.git@6bbcefc45d0257d7a2fe64a6d3b553016c2c8b30',
'src/third_party/skia/third_party/glu':
Var('git_url') + '/external/skia/third_party/glu.git@c988402115946ed3cb7fb347f6eef4a8cec543e2',
+ 'src/third_party/smhasher/src':
+ Var('git_url') + '/external/smhasher.git@b35e562e2d80bc47a51b53ec92a305eb9a3383b4',
'src/third_party/snappy/src':
Var('git_url') + '/external/snappy.git@5258607248a000affb2f72b87b9bbd044806677d',
'src/third_party/speex':
@@ -87,7 +98,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':
@@ -99,7 +110,7 @@ deps = {
'src/tools/page_cycler/acid3':
Var('git_url') + '/chromium/deps/acid3.git@59c6ae4c476750845a529cd407454378ebaaa347',
'src/v8':
- Var('git_url') + '/external/v8.git@80c42ed5ace766a3a02b30a53a25e5e81e234723',
+ Var('git_url') + '/external/v8.git@0886ce0194fc6ee97952eabafe7b0993b5ee2581',
}
deps_os = {
@@ -108,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':
@@ -123,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@b9cc80a6',
+ 'src/third_party/cros_system_api':
+ 'http://git.chromium.org/chromiumos/platform/system_api.git@c3de536a',
'src/third_party/lss':
Var('git_url') + '/external/linux-syscall-support/lss.git@d4ba6b8d8c6ab24825d11d4e5b69920c41b36880',
'src/third_party/openssl':
@@ -136,15 +151,15 @@ 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@a2459c4005bb0af52d59a0c81fdd1a853ed91f75',
'src/third_party/cygwin':
Var('git_url') + '/chromium/deps/cygwin.git@06a117a90c15174436bfa20ceebbfdf43b7eb820',
'src/third_party/ffmpeg/binaries/chromium/win/ia32':
- Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@70a0e0fcfaa17aa71ec403c3c7ae78afa91fb1d7',
+ Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@e77e9c020c58b73018c6e18b2cbaf7a0d5fc4213',
'src/third_party/lighttpd':
Var('git_url') + '/chromium/deps/lighttpd.git@856e79c6109d4f0abe93c01d4c22419e33c9bee7',
'src/third_party/mingw-w64/mingw/bin':