Move hooks_os to hooks (behind condition)
Bug: 570091
Change-Id: Ic60164d28280eba0c6240350236d1b3534e9ea90
Reviewed-on: https://chromium-review.googlesource.com/695541
Reviewed-by: Mike West <[email protected]>
Commit-Queue: Paweł Hajdan Jr. <[email protected]>
Cr-Commit-Position: refs/heads/master@{#505646}diff --git a/DEPS b/DEPS
index 5782943..3dd9fc9b 100644
--- a/DEPS
+++ b/DEPS
@@ -1038,227 +1038,244 @@
'-s', 'src/third_party/checkstyle/checkstyle-8.0-all.jar.sha1'
],
},
-]
-# Note: These are keyed off target os, not host os. So don't move things here
-# that depend on the target os.
-hooks_os = {
- 'android': [
- {
- # This downloads SDK extras and puts them in the
- # third_party/android_tools/sdk/extras directory.
- '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/android/play_services/update.py',
- 'download'
- ],
- },
- {
- 'name': 'android_system_sdk',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'android_system_stubs',
- '-l', 'third_party/android_system_sdk'
- ],
- },
- {
- 'name': 'intellij',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-intellij',
- '-l', 'third_party/intellij'
- ],
- },
- {
- 'name': 'javax_inject',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-javax-inject',
- '-l', 'third_party/javax_inject'
- ],
- },
- {
- 'name': 'hamcrest',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-hamcrest',
- '-l', 'third_party/hamcrest'
- ],
- },
- {
- 'name': 'guava',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-guava',
- '-l', 'third_party/guava'
- ],
- },
- {
- 'name': 'android_support_test_runner',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-android-support-test-runner',
- '-l', 'third_party/android_support_test_runner'
- ],
- },
- {
- 'name': 'byte_buddy',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-byte-buddy',
- '-l', 'third_party/byte_buddy'
- ],
- },
- {
- 'name': 'espresso',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-espresso',
- '-l', 'third_party/espresso'
- ],
- },
- {
- 'name': 'robolectric_libs',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-robolectric',
- '-l', 'third_party/robolectric'
- ],
- },
- {
- 'name': 'apache_velocity',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-apache-velocity',
- '-l', 'third_party/apache_velocity'
- ],
- },
- {
- 'name': 'ow2_asm',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-ow2-asm',
- '-l', 'third_party/ow2_asm'
- ],
- },
- {
- 'name': 'desugar',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-android-tools/bazel/desugar',
- '-l', 'third_party/bazel/desugar'
- ],
- },
- {
- 'name': 'apk-patch-size-estimator',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-android-tools/apk-patch-size-estimator',
- '-l', 'third_party/apk-patch-size-estimator/lib'
- ],
- },
- {
- 'name': 'icu4j',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-icu4j',
- '-l', 'third_party/icu4j'
- ],
- },
- {
- 'name': 'accessibility_test_framework',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-accessibility-test-framework',
- '-l', 'third_party/accessibility_test_framework'
- ],
- },
- {
- 'name': 'bouncycastle',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-bouncycastle',
- '-l', 'third_party/bouncycastle'
- ],
- },
- {
- 'name': 'sqlite4java',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-sqlite4java',
- '-l', 'third_party/sqlite4java'
- ],
- },
- {
- 'name': 'gson',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-gson',
- '-l', 'third_party/gson',
- ],
- },
- {
- 'name': 'objenesis',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-objenesis',
- '-l', 'third_party/objenesis'
- ],
- },
- {
- 'name': 'xstream',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-robolectric',
- '-l', 'third_party/xstream'
- ],
- },
- {
- 'name': 'gvr_static_shim_android_arm',
- 'pattern': '\\.sha1',
+ {
+ # This downloads SDK extras and puts them in the
+ # third_party/android_tools/sdk/extras directory.
+ 'name': 'sdkextras',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ # 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/android/play_services/update.py',
+ 'download'
+ ],
+ },
+ {
+ 'name': 'android_system_sdk',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'android_system_stubs',
+ '-l', 'third_party/android_system_sdk'
+ ],
+ },
+ {
+ 'name': 'intellij',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-intellij',
+ '-l', 'third_party/intellij'
+ ],
+ },
+ {
+ 'name': 'javax_inject',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-javax-inject',
+ '-l', 'third_party/javax_inject'
+ ],
+ },
+ {
+ 'name': 'hamcrest',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-hamcrest',
+ '-l', 'third_party/hamcrest'
+ ],
+ },
+ {
+ 'name': 'guava',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-guava',
+ '-l', 'third_party/guava'
+ ],
+ },
+ {
+ 'name': 'android_support_test_runner',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-android-support-test-runner',
+ '-l', 'third_party/android_support_test_runner'
+ ],
+ },
+ {
+ 'name': 'byte_buddy',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-byte-buddy',
+ '-l', 'third_party/byte_buddy'
+ ],
+ },
+ {
+ 'name': 'espresso',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-espresso',
+ '-l', 'third_party/espresso'
+ ],
+ },
+ {
+ 'name': 'robolectric_libs',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-robolectric',
+ '-l', 'third_party/robolectric'
+ ],
+ },
+ {
+ 'name': 'apache_velocity',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-apache-velocity',
+ '-l', 'third_party/apache_velocity'
+ ],
+ },
+ {
+ 'name': 'ow2_asm',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-ow2-asm',
+ '-l', 'third_party/ow2_asm'
+ ],
+ },
+ {
+ 'name': 'desugar',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-android-tools/bazel/desugar',
+ '-l', 'third_party/bazel/desugar'
+ ],
+ },
+ {
+ 'name': 'apk-patch-size-estimator',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-android-tools/apk-patch-size-estimator',
+ '-l', 'third_party/apk-patch-size-estimator/lib'
+ ],
+ },
+ {
+ 'name': 'icu4j',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-icu4j',
+ '-l', 'third_party/icu4j'
+ ],
+ },
+ {
+ 'name': 'accessibility_test_framework',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-accessibility-test-framework',
+ '-l', 'third_party/accessibility_test_framework'
+ ],
+ },
+ {
+ 'name': 'bouncycastle',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-bouncycastle',
+ '-l', 'third_party/bouncycastle'
+ ],
+ },
+ {
+ 'name': 'sqlite4java',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-sqlite4java',
+ '-l', 'third_party/sqlite4java'
+ ],
+ },
+ {
+ 'name': 'gson',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-gson',
+ '-l', 'third_party/gson',
+ ],
+ },
+ {
+ 'name': 'objenesis',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-objenesis',
+ '-l', 'third_party/objenesis'
+ ],
+ },
+ {
+ 'name': 'xstream',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-robolectric',
+ '-l', 'third_party/xstream'
+ ],
+ },
+ {
+ 'name': 'gvr_static_shim_android_arm',
+ 'pattern': '\\.sha1',
+ 'condition': 'checkout_android',
'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
@@ -1266,11 +1283,12 @@
'--no_auth',
'--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1',
- ],
- },
- {
- 'name': 'gvr_static_shim_android_arm64',
- 'pattern': '\\.sha1',
+ ],
+ },
+ {
+ 'name': 'gvr_static_shim_android_arm64',
+ 'pattern': '\\.sha1',
+ 'condition': 'checkout_android',
'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
@@ -1279,10 +1297,11 @@
'--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1',
],
- },
- {
- 'name': 'vr_controller_test_api',
- 'pattern': '\\.sha1',
+ },
+ {
+ 'name': 'vr_controller_test_api',
+ 'pattern': '\\.sha1',
+ 'condition': 'checkout_android',
'action': [ 'python',
'src/third_party/depot_tools/download_from_google_storage.py',
'--no_resume',
@@ -1290,37 +1309,38 @@
'--no_auth',
'--bucket', 'chromium-gvr-static-shim/controller_test_api',
'-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1',
- ],
- },
- # Download VR test APKs only if the environment variable is set
- {
- 'name': 'vr_test_apks',
- 'pattern': '.',
- 'action': [ 'python',
- 'src/third_party/gvr-android-sdk/test-apks/update.py',
- ],
- },
- {
- # Pull doclava binaries if building for Android.
- 'name': 'doclava',
- 'pattern': '.',
- 'action': ['python',
- 'src/build/android/download_doclava.py',
- ],
- },
- ],
- 'fuchsia': [
- {
- 'name': 'fuchsia_sdk',
- 'pattern': '.',
- 'action': [
- 'python',
- 'src/build/fuchsia/update_sdk.py',
- '36d9ffb6bda53112e826941757efe04654050d46',
- ],
- },
- ],
-}
+ ],
+ },
+ # Download VR test APKs only if the environment variable is set
+ {
+ 'name': 'vr_test_apks',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': [ 'python',
+ 'src/third_party/gvr-android-sdk/test-apks/update.py',
+ ],
+ },
+ {
+ # Pull doclava binaries if building for Android.
+ 'name': 'doclava',
+ 'pattern': '.',
+ 'condition': 'checkout_android',
+ 'action': ['python',
+ 'src/build/android/download_doclava.py',
+ ],
+ },
+
+ {
+ 'name': 'fuchsia_sdk',
+ 'pattern': '.',
+ 'condition': 'checkout_fuchsia',
+ 'action': [
+ 'python',
+ 'src/build/fuchsia/update_sdk.py',
+ '36d9ffb6bda53112e826941757efe04654050d46',
+ ],
+ },
+]
recursedeps = [
# buildtools provides clang_format, libc++, and libc++abi
