Skip to content

GitLab

T
tangled
Commit 44faa4c0 authored by amineer's avatar amineer Committed by Commit bot
Browse files
Options

Revert of android: Move most hooks to target_os-specific section. (patchset #3... 

Revert of android: Move most hooks to target_os-specific section. (patchset #3 id:40001 of https://codereview.chromium.org/2889323003/ )

Reason for revert:
Causes build failures.

BUG=724813

Original issue's description:
> android: Move most hooks to target_os-specific section.
>
> gclient recently learned about os-specific hooks, so let's make it so
> that only people working on android need to run the many, many
> android-specific hooks.
>
> No intended behavior change.  This depends on your gclient being
> up-to-date -- it's supposed to auto-update every time you run
> `gclient`, but that sometimes doesn't work.  If you see issues
> after this, `cd ~/src/depot_tools` and `git log` to verify
> that your depot_tools is up-to-date (if it isn't, it's probably
> easiest to delete and re-checkout depot_tools).
>
> BUG=none
>
> Review-Url: https://codereview.chromium.org/2889323003
> Cr-Commit-Position: refs/heads/master@{#473247}
> Committed: https://chromium.googlesource.com/chromium/src/+/e11217d349cd215cde35f3dde1174a149303ac9c

TBR=jbudorick@chromium.org,thakis@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=none

Review-Url: https://codereview.chromium.org/2900523002
Cr-Commit-Position: refs/heads/master@{#473446}
parent 21e6d26f
Show whitespace changes
Inline Side-by-side
Showing with 263 additions and 266 deletions
DEPS
View file @ 44faa4c0
......@@ -586,6 +586,198 @@ hooks = [
'sync', '--extract',
],
},
{
# 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': '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': 'retrolambda',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-android-tools/retrolambda',
'-l', 'third_party/retrolambda'
],
},
{
'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': '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'
],
},
{
# Downloads the current stable linux sysroot to build/linux/ if needed.
# This sysroot updates at about the same rate that the chrome build deps
......@@ -710,6 +902,60 @@ hooks = [
'-s', 'src/buildtools/linux64/clang-format.sha1',
],
},
{
'name': 'checkstyle',
'pattern': '.',
'action': [ 'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-android-tools/checkstyle',
'-s', 'src/third_party/checkstyle/checkstyle-7.6.1-all.jar.sha1'
],
},
{
'name': 'gvr_static_shim_android_arm',
'pattern': '\\.sha1',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--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',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1',
],
},
{
'name': 'gvr_common_aar',
'pattern': '\\.sha1',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/common_library.aar.sha1',
],
},
{
'name': 'vr_controller_test_api',
'pattern': '\\.sha1',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gvr-static-shim/controller_test_api',
'-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1',
],
},
# Pull luci-go binaries (isolate, swarming) using checked-in hashes.
{
'name': 'luci-go_win',
......@@ -800,6 +1046,14 @@ hooks = [
'pattern': '\\.sha1',
'action': ['python', 'src/third_party/instrumented_libraries/scripts/download_binaries.py'],
},
{
# Pull doclava binaries if building for Android.
'name': 'doclava',
'pattern': '.',
'action': ['python',
'src/build/android/download_doclava.py',
],
},
{
"name": "wasm_fuzzer",
"pattern": ".",
......@@ -880,267 +1134,6 @@ hooks = [
'-s', 'src/third_party/node/node_modules.tar.gz.sha1',
],
},
# Download Telemetry's binary dependencies
{
'name': 'fetch_telemetry_binary_dependencies',
'pattern': '.',
'action': [ 'python',
'src/third_party/catapult/telemetry/bin/fetch_telemetry_binary_dependencies',
],
},
]
# 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': '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': 'retrolambda',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-android-tools/retrolambda',
'-l', 'third_party/retrolambda'
],
},
{
'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': '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': 'checkstyle',
'pattern': '.',
'action': [ 'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-android-tools/checkstyle',
'-s', 'src/third_party/checkstyle/checkstyle-7.6.1-all.jar.sha1'
],
},
{
'name': 'gvr_static_shim_android_arm',
'pattern': '\\.sha1',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--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',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1',
],
},
{
'name': 'gvr_common_aar',
'pattern': '\\.sha1',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gvr-static-shim',
'-s', 'src/third_party/gvr-android-sdk/common_library.aar.sha1',
],
},
{
'name': 'vr_controller_test_api',
'pattern': '\\.sha1',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--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',
......@@ -1149,15 +1142,18 @@ hooks_os = {
'src/third_party/gvr-android-sdk/test-apks/update.py',
],
},
# Download Telemetry's binary dependencies
{
# Pull doclava binaries if building for Android.
'name': 'doclava',
'name': 'fetch_telemetry_binary_dependencies',
'pattern': '.',
'action': ['python',
'src/build/android/download_doclava.py',
'action': [ 'python',
'src/third_party/catapult/telemetry/bin/fetch_telemetry_binary_dependencies',
],
},
],
]
hooks_os = {
'fuchsia': [
{
'name': 'fuchsia_sdk',
......@@ -1169,6 +1165,7 @@ hooks_os = {
],
},
],
# TODO(scottmg|thakis): Move the Android-only hooks from above here.
}
recursedeps = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment