Index: DEPS |
diff --git a/DEPS b/DEPS |
index 6055c40c140cb645748ba9eb50cfce41aa6987f4..f1ba44cf0af491af04bdc594fa09ea27e0907ef4 100644 |
--- a/DEPS |
+++ b/DEPS |
@@ -19,8 +19,11 @@ |
vars = { |
'chromium_git': 'https://chromium.googlesource.com', |
- 'buildtools_revision': '565d04e8741429fb1b4f26d102f2c6c3b849edeb', |
+ 'base_revision': '82833117dada3473e590e2ecf1ba6250193e5f9d', |
'boringssl_revision': 'a7997f12be358e58aeb2345bb8b88a9d53240024', |
+ 'buildtools_revision': '222bd42ce39d1bd8f08fe089b066f49c469e1cdf', |
+ 'mojo_devtools_revision': '176889fd2e17f988727847a03b00c158af8a6c52', |
+ 'mojo_sdk_revision': '88ed73337a362aec488d070424e39c55ecdfa55c', |
} |
# Only these hosts are allowed for dependencies in this DEPS file. |
@@ -32,19 +35,10 @@ allowed_hosts = [ |
deps = { |
'src/base': |
- Var('chromium_git') + '/chromium/src/base.git' + '@' + '664aee2139dbf56a3b9ce75cd3ccb7581b92035f', |
- |
- 'src/build/config': |
- Var('chromium_git') + '/chromium/src/build/config.git' + '@' + '8b3ea542b26d9adce77515ab063e88a8148fa09a', |
- |
- 'src/build/toolchain': |
- Var('chromium_git') + '/chromium/src/build/toolchain.git' + '@' + '3793779608aa15ae1bfb09853636aea5a5e42a59', |
+ Var('chromium_git') + '/external/github.com/domokit/base' + '@' + Var('base_revision'), |
'src/buildtools': |
- Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), |
- |
- 'src/crypto': |
- Var('chromium_git') + '/chromium/src/crypto.git' + '@' + '0e395c923a66155550f5b83edf0db7fc08339a4f', |
+ Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), |
'src/sdch/open-vcdiff': |
Var('chromium_git') + '/external/open-vcdiff.git' + '@' + '438f2a5be6d809bc21611a94cd37bfc8c28ceb33', # from svn revision 41 |
@@ -56,16 +50,16 @@ deps = { |
Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271', # from svn revision 501 |
'src/third_party/boringssl/src': |
- 'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('boringssl_revision'), |
+ 'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('boringssl_revision'), |
'src/third_party/requests/src': |
Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', |
'src/third_party/icu': |
- Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '7c81740601355556e630da515b74d889ba2f8d08', |
+ Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '94e4b770ce2f6065d4261d29c32683a6099b9d93', |
'src/third_party/mojo/src/mojo/public': |
- Var('chromium_git') + '/external/github.com/domokit/mojo_sdk.git' + '@' + '15fd82cc2c30e084a44ad4fdeea6db9dbc96b71d', |
+ Var('chromium_git') + '/external/github.com/domokit/mojo_sdk.git' + '@' + Var('mojo_sdk_revision'), |
'src/tools/grit': |
Var('chromium_git') + '/external/grit-i18n.git' + '@' + 'c1b1591a05209c1ad467e845ba8543c22f9072af', # from svn revision 189 |
@@ -74,14 +68,11 @@ deps = { |
Var('chromium_git') + '/chromiumos/third_party/pyelftools.git' + '@' + '19b3e610c86fcadb837d252c794cb5e8008826ae', |
'src/third_party/mojo_devtools': |
- 'https://github.com/domokit/devtools.git' + '@' + '0c49abb6f81b6dbb114e1e081070b19e510e3347', |
+ 'https://github.com/domokit/devtools.git' + '@' + Var('mojo_devtools_revision'), |
} |
deps_os = { |
'android': { |
- 'src/third_party/android_tools': |
- Var('chromium_git') + '/android_tools.git' + '@' + '3c5189b5b05fad7e0bcfb60835bde75d4211964c', |
- |
'src/third_party/appurify-python/src': |
Var('chromium_git') + '/external/github.com/appurify/appurify-python.git' + '@' + 'ee7abd5c5ae3106f72b2a0b9d2cb55094688e867', |
@@ -112,6 +103,22 @@ hooks = [ |
'action': ['python', 'src/tools/clang/scripts/update.py', '--if-needed'], |
}, |
{ |
+ # This downloads android_tools according to tools/android/VERSION_*. |
+ 'name': 'android_tools', |
+ 'pattern': '.', |
+ 'action': ['python', 'src/tools/android/download_android_tools.py'], |
+ }, |
+ { |
+ # This downloads SDK extras and puts them in the |
+ # third_party/android_tools/sdk/extras directory on the bots. Developers |
+ # need to manually install these packages and accept the ToS. |
+ 'name': 'sdkextras', |
+ 'pattern': '.', |
+ # When adding a new sdk extras package to download, add the package |
+ # directory and zip file to .gitignore in third_party/android_tools. |
+ 'action': ['python', 'src/build/download_sdk_extras.py'], |
+ }, |
+ { |
'name': 'gn_linux64', |
'pattern': '.', |
'action': [ 'download_from_google_storage', |
@@ -187,4 +194,17 @@ hooks = [ |
'--version-file=../../../../MOJO_VERSION', |
], |
}, |
+ # Pull the mojom parser binaries using checked-in hashes. |
+ { |
+ 'name': 'mojom_tool', |
+ 'pattern': '', |
+ 'action': [ 'src/tools/download_from_google_storage.py', |
+ '--no_resume', |
+ '--quiet', |
+ '--platform=linux*', |
+ '--no_auth', |
+ '--bucket', 'mojo/mojom_parser/linux64', |
+ '-s', 'src/third_party/mojo/src/mojo/public/tools/bindings/mojom_tool/bin/linux64/mojom.sha1', |
+ ], |
+ }, |
] |