Skip to content

GitLab

T
tangled
Commit 6134a131 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot
Browse files
Options

Revert "Reland #2: Android: Use locally-build devil deps only when build_with_chromium=true" 

This reverts commit 8e2b3210.

Reason for revert: Breaks angle_unittests on emulator

Original change's description:
> Reland #2: Android: Use locally-build devil deps only when build_with_chromium=true
>
> This reverts commit 85773e52.
>
> Reason for reland:
>  * Fixed data deps
>  * _BuildWithChromium() handles missing key
>
> Original change's description:
> > Revert "Reland "Android: Use locally-build devil deps only when build_with_chromium=true""
> >
> > This reverts commit f8b7ec28.
> >
> > Reason for revert: Causing all builds to fail on android-pixel2-perf failing
> >
> > Original change's description:
> > > Reland "Android: Use locally-build devil deps only when build_with_chromium=true"
> > >
> > > This reverts commit b47e9c83.
> > >
> > > Reason for reland: Updated more .pydeps files.
> > >
> > > Original change's description:
> > > > Revert "Android: Use locally-build devil deps only when build_with_chromium=true"
> > > >
> > > > This reverts commit 49fdeca1.
> > > >
> > > > Reason for revert: Breaking presubmit due to stale .pydeps file:
> > > > android_webview/tools/run_cts.pydeps
> > > >
> > > > Original change's description:
> > > > > Android: Use locally-build devil deps only when build_with_chromium=true
> > > > >
> > > > > Bug: 1120190
> > > > > Change-Id: I763e42a7ae69d14eb61caebd220844b756d6d171
> > > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2480842
> > > > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > > > Reviewed-by: Ben Pastene <bpastene@chromium.org>
> > > > > Cr-Commit-Position: refs/heads/master@{#819489}
> > > >
> > > > TBR=agrieve@chromium.org,bpastene@chromium.org
> > > >
> > > > Change-Id: I960ad355283c66951e5931f61e25421c5a5dfdf7
> > > > No-Presubmit: true
> > > > No-Tree-Checks: true
> > > > No-Try: true
> > > > Bug: 1120190
> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490857
> > > > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > > Cr-Commit-Position: refs/heads/master@{#819668}
> > >
> > > TBR=agrieve # reland
> > >
> > > Bug: 1120190
> > > Change-Id: I8f3e21182e83a3e88da52331d56a8bef76507939
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490558
> > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#819810}
> >
> > TBR=agrieve@chromium.org,bpastene@chromium.org
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: 1120190, 1141891
> > Change-Id: I490f2e8a972b260a81b942e248c0f920af11db46
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495335
> > Reviewed-by: John Chen <johnchen@chromium.org>
> > Commit-Queue: John Chen <johnchen@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#820355}
>
> Bug: 1120190
> Bug: 1141891
> Change-Id: Ic7a398fcd8cb5f45a03c20acbd4e9c7300442f38
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2497153
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823651}

TBR=agrieve@chromium.org,bpastene@chromium.org

Change-Id: Ia586b0d8f68795e493074ba6b00ac36c529eb1ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1120190
Bug: 1145570
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519425Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824002}
parent a04f522e
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 219 deletions
BUILD.gn
View file @ 6134a131
...@@ -1254,11 +1254,7 @@ if (!is_ios) { ...@@ -1254,11 +1254,7 @@ if (!is_ios) {
root_build_dir) + ")" ] root_build_dir) + ")" ]
data = [ data = [
# These tests use //build/android/devil_chromium.py even when !is_android,
# so cannot use the helpers in //build/android (they assert(is_android)).
"//build/android/", "//build/android/",
"//build/gn_helpers.py",
"//build/config/gclient_args.gni",
"//components/crash/content/tools/generate_breakpad_symbols.py", "//components/crash/content/tools/generate_breakpad_symbols.py",
"//third_party/blink/renderer/bindings/scripts/", "//third_party/blink/renderer/bindings/scripts/",
"//third_party/blink/renderer/build/scripts/", "//third_party/blink/renderer/build/scripts/",
......
PRESUBMIT.py
View file @ 6134a131
...@@ -1291,7 +1291,6 @@ _GENERIC_PYDEPS_FILES = [ ...@@ -1291,7 +1291,6 @@ _GENERIC_PYDEPS_FILES = [
'android_webview/tools/run_cts.pydeps', 'android_webview/tools/run_cts.pydeps',
'base/android/jni_generator/jni_generator.pydeps', 'base/android/jni_generator/jni_generator.pydeps',
'base/android/jni_generator/jni_registration_generator.pydeps', 'base/android/jni_generator/jni_registration_generator.pydeps',
'build/android/apk_operations.pydeps',
'build/android/devil_chromium.pydeps', 'build/android/devil_chromium.pydeps',
'build/android/gyp/aar.pydeps', 'build/android/gyp/aar.pydeps',
'build/android/gyp/aidl.pydeps', 'build/android/gyp/aidl.pydeps',
......
android_webview/test/BUILD.gn
View file @ 6134a131
...@@ -24,6 +24,7 @@ python_library("webview_cts_tests") { ...@@ -24,6 +24,7 @@ python_library("webview_cts_tests") {
pydeps_file = "//android_webview/tools/run_cts.pydeps" pydeps_file = "//android_webview/tools/run_cts.pydeps"
deps = [ "//android_webview:system_webview_apk" ] deps = [ "//android_webview:system_webview_apk" ]
data_deps = [ data_deps = [
"//build/android:logdog_wrapper_py",
"//build/android:test_runner_py", "//build/android:test_runner_py",
"//testing/buildbot/filters:webview_cts_tests_filters", "//testing/buildbot/filters:webview_cts_tests_filters",
] ]
......
android_webview/tools/run_cts.pydeps
View file @ 6134a131
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
//build/android/pylib/local/emulator/proto/avd_pb2.py //build/android/pylib/local/emulator/proto/avd_pb2.py
//build/android/pylib/utils/__init__.py //build/android/pylib/utils/__init__.py
//build/android/pylib/utils/test_filter.py //build/android/pylib/utils/test_filter.py
//build/gn_helpers.py
//third_party/catapult/common/py_utils/py_utils/__init__.py //third_party/catapult/common/py_utils/py_utils/__init__.py
//third_party/catapult/common/py_utils/py_utils/cloud_storage.py //third_party/catapult/common/py_utils/py_utils/cloud_storage.py
//third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py //third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
......
build/android/BUILD.gn
View file @ 6134a131
...@@ -52,32 +52,9 @@ python_library("devil_chromium_py") { ...@@ -52,32 +52,9 @@ python_library("devil_chromium_py") {
"devil_chromium.json", "devil_chromium.json",
"//third_party/catapult/third_party/gsutil/", "//third_party/catapult/third_party/gsutil/",
"//third_party/catapult/devil/devil/devil_dependencies.json", "//third_party/catapult/devil/devil/devil_dependencies.json",
# Read by gn_helpers.BuildWithChromium()
"//build/config/gclient_args.gni",
] ]
} }
# Contains runtime deps for installing apks.
# E.g. from test_runner.py or from apk_operations.py.
group("apk_installer_data") {
# Other //build users let devil library fetch these from Google Storage.
if (build_with_chromium) {
data_deps = [
"//build/android/pylib/device/commands",
"//tools/android/md5sum",
]
data = [
"//third_party/android_build_tools/bundletool/bundletool-all-1.2.0.jar",
]
}
}
python_library("apk_operations_py") {
pydeps_file = "apk_operations.pydeps"
deps = [ ":apk_installer_data" ]
}
python_library("test_runner_py") { python_library("test_runner_py") {
testonly = true testonly = true
pydeps_file = "test_runner.pydeps" pydeps_file = "test_runner.pydeps"
...@@ -92,17 +69,14 @@ python_library("test_runner_py") { ...@@ -92,17 +69,14 @@ python_library("test_runner_py") {
"${android_sdk_root}/platform-tools/adb", "${android_sdk_root}/platform-tools/adb",
"//third_party/requests/", "//third_party/requests/",
] ]
data_deps = [ data_deps = [ ":devil_chromium_py" ]
":apk_installer_data",
":devil_chromium_py",
":logdog_wrapper_py",
":stack_tools",
]
# Other //build users let devil library fetch these from Google Storage.
if (build_with_chromium) { if (build_with_chromium) {
data_deps += [ "//tools/android/forwarder2" ] data += [
data += [ "//tools/android/avd/proto/" ] "//third_party/android_build_tools/bundletool/bundletool-all-1.2.0.jar",
"//tools/android/avd/proto/",
]
data_deps +=
[ "//third_party/android_platform/development/scripts:stack_py" ]
if (is_asan) { if (is_asan) {
data_deps += [ "//tools/android/asan/third_party:asan_device_setup" ] data_deps += [ "//tools/android/asan/third_party:asan_device_setup" ]
} }
...@@ -130,14 +104,19 @@ python_library("resource_sizes_py") { ...@@ -130,14 +104,19 @@ python_library("resource_sizes_py") {
] ]
} }
python_library("bundle_wrapper_script_py") {
pydeps_file = "gyp/create_bundle_wrapper_script.pydeps"
data = [
"//third_party/android_build_tools/bundletool/bundletool-all-1.2.0.jar",
]
}
# Tools necessary for symbolizing tombstones or stack traces that are output to # Tools necessary for symbolizing tombstones or stack traces that are output to
# logcat. # logcat.
# Hidden behind build_with_chromium because some third party repos that use # Hidden behind build_with_chromium because some third party repos that use
# //build don't pull in //third_party/android_platform. # //build don't pull in //third_party/android_platform.
# TODO(crbug.com/1120190): Move stack script into //build/third_party if (build_with_chromium) {
# and enable unconditionally. group("stack_tools") {
group("stack_tools") {
if (build_with_chromium) {
data = [ data = [
"tombstones.py", "tombstones.py",
"pylib/symbols/", "pylib/symbols/",
......
build/android/apk_operations.pydeps deleted 100644 → 0
View file @ a04f522e
# Generated by running:
# build/print_python_deps.py --root build/android --output build/android/apk_operations.pydeps build/android/apk_operations.py
../../third_party/catapult/common/py_utils/py_utils/__init__.py
../../third_party/catapult/common/py_utils/py_utils/cloud_storage.py
../../third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
../../third_party/catapult/common/py_utils/py_utils/lock.py
../../third_party/catapult/common/py_utils/py_utils/tempfile_ext.py
../../third_party/catapult/dependency_manager/dependency_manager/__init__.py
../../third_party/catapult/dependency_manager/dependency_manager/archive_info.py
../../third_party/catapult/dependency_manager/dependency_manager/base_config.py
../../third_party/catapult/dependency_manager/dependency_manager/cloud_storage_info.py
../../third_party/catapult/dependency_manager/dependency_manager/dependency_info.py
../../third_party/catapult/dependency_manager/dependency_manager/dependency_manager_util.py
../../third_party/catapult/dependency_manager/dependency_manager/exceptions.py
../../third_party/catapult/dependency_manager/dependency_manager/local_path_info.py
../../third_party/catapult/dependency_manager/dependency_manager/manager.py
../../third_party/catapult/dependency_manager/dependency_manager/uploader.py
../../third_party/catapult/devil/devil/__init__.py
../../third_party/catapult/devil/devil/android/__init__.py
../../third_party/catapult/devil/devil/android/apk_helper.py
../../third_party/catapult/devil/devil/android/constants/__init__.py
../../third_party/catapult/devil/devil/android/constants/chrome.py
../../third_party/catapult/devil/devil/android/constants/file_system.py
../../third_party/catapult/devil/devil/android/decorators.py
../../third_party/catapult/devil/devil/android/device_denylist.py
../../third_party/catapult/devil/devil/android/device_errors.py
../../third_party/catapult/devil/devil/android/device_signal.py
../../third_party/catapult/devil/devil/android/device_temp_file.py
../../third_party/catapult/devil/devil/android/device_utils.py
../../third_party/catapult/devil/devil/android/flag_changer.py
../../third_party/catapult/devil/devil/android/install_commands.py
../../third_party/catapult/devil/devil/android/logcat_monitor.py
../../third_party/catapult/devil/devil/android/md5sum.py
../../third_party/catapult/devil/devil/android/ndk/__init__.py
../../third_party/catapult/devil/devil/android/ndk/abis.py
../../third_party/catapult/devil/devil/android/sdk/__init__.py
../../third_party/catapult/devil/devil/android/sdk/aapt.py
../../third_party/catapult/devil/devil/android/sdk/adb_wrapper.py
../../third_party/catapult/devil/devil/android/sdk/build_tools.py
../../third_party/catapult/devil/devil/android/sdk/bundletool.py
../../third_party/catapult/devil/devil/android/sdk/intent.py
../../third_party/catapult/devil/devil/android/sdk/keyevent.py
../../third_party/catapult/devil/devil/android/sdk/split_select.py
../../third_party/catapult/devil/devil/android/sdk/version_codes.py
../../third_party/catapult/devil/devil/android/tools/__init__.py
../../third_party/catapult/devil/devil/android/tools/script_common.py
../../third_party/catapult/devil/devil/base_error.py
../../third_party/catapult/devil/devil/constants/__init__.py
../../third_party/catapult/devil/devil/constants/exit_codes.py
../../third_party/catapult/devil/devil/devil_env.py
../../third_party/catapult/devil/devil/utils/__init__.py
../../third_party/catapult/devil/devil/utils/cmd_helper.py
../../third_party/catapult/devil/devil/utils/host_utils.py
../../third_party/catapult/devil/devil/utils/lazy/__init__.py
../../third_party/catapult/devil/devil/utils/lazy/weak_constant.py
../../third_party/catapult/devil/devil/utils/logging_common.py
../../third_party/catapult/devil/devil/utils/lsusb.py
../../third_party/catapult/devil/devil/utils/parallelizer.py
../../third_party/catapult/devil/devil/utils/reraiser_thread.py
../../third_party/catapult/devil/devil/utils/reset_usb.py
../../third_party/catapult/devil/devil/utils/run_tests_helper.py
../../third_party/catapult/devil/devil/utils/timeout_retry.py
../../third_party/catapult/devil/devil/utils/watchdog_timer.py
../../third_party/catapult/devil/devil/utils/zip_utils.py
../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
../../third_party/jinja2/__init__.py
../../third_party/jinja2/_compat.py
../../third_party/jinja2/bccache.py
../../third_party/jinja2/compiler.py
../../third_party/jinja2/defaults.py
../../third_party/jinja2/environment.py
../../third_party/jinja2/exceptions.py
../../third_party/jinja2/filters.py
../../third_party/jinja2/idtracking.py
../../third_party/jinja2/lexer.py
../../third_party/jinja2/loaders.py
../../third_party/jinja2/nodes.py
../../third_party/jinja2/optimizer.py
../../third_party/jinja2/parser.py
../../third_party/jinja2/runtime.py
../../third_party/jinja2/tests.py
../../third_party/jinja2/utils.py
../../third_party/jinja2/visitor.py
../../third_party/markupsafe/__init__.py
../../third_party/markupsafe/_compat.py
../../third_party/markupsafe/_native.py
../gn_helpers.py
../print_python_deps.py
adb_command_line.py
apk_operations.py
convert_dex_profile.py
devil_chromium.py
gyp/bundletool.py
gyp/dex.py
gyp/util/__init__.py
gyp/util/build_utils.py
gyp/util/md5_check.py
gyp/util/resource_utils.py
gyp/util/zipalign.py
incremental_install/__init__.py
incremental_install/installer.py
pylib/__init__.py
pylib/constants/__init__.py
pylib/constants/host_paths.py
pylib/symbols/__init__.py
pylib/symbols/deobfuscator.py
pylib/utils/__init__.py
pylib/utils/app_bundle_utils.py
pylib/utils/simpleperf.py
pylib/utils/time_profile.py
build/android/devil_chromium.py
View file @ 6134a131
...@@ -7,21 +7,14 @@ ...@@ -7,21 +7,14 @@
import os import os
import sys import sys
from pylib import constants
from pylib.constants import host_paths from pylib.constants import host_paths
if host_paths.DEVIL_PATH not in sys.path: if host_paths.DEVIL_PATH not in sys.path:
sys.path.insert(1, host_paths.DEVIL_PATH) sys.path.append(host_paths.DEVIL_PATH)
from devil import devil_env from devil import devil_env
from devil.android.ndk import abis from devil.android.ndk import abis
_BUILD_DIR = os.path.join(constants.DIR_SOURCE_ROOT, 'build')
if _BUILD_DIR not in sys.path:
sys.path.insert(1, _BUILD_DIR)
import gn_helpers
_DEVIL_CONFIG = os.path.abspath( _DEVIL_CONFIG = os.path.abspath(
os.path.join(os.path.dirname(__file__), 'devil_chromium.json')) os.path.join(os.path.dirname(__file__), 'devil_chromium.json'))
...@@ -114,35 +107,6 @@ _DEVIL_BUILD_PRODUCT_DEPS = { ...@@ -114,35 +107,6 @@ _DEVIL_BUILD_PRODUCT_DEPS = {
} }
def _UseLocalBuildProducts(output_directory, devil_dynamic_config):
output_directory = os.path.abspath(output_directory)
devil_dynamic_config['dependencies'] = {
dep_name: {
'file_info': {
'%s_%s' % (dep_config['platform'], dep_config['arch']): {
'local_paths': [
os.path.join(output_directory,
*dep_config['path_components']),
],
}
for dep_config in dep_configs
}
}
for dep_name, dep_configs in _DEVIL_BUILD_PRODUCT_DEPS.iteritems()
}
def _BuildWithChromium():
"""Returns value of gclient's |build_with_chromium|."""
gni_path = os.path.join(_BUILD_DIR, 'config', 'gclient_args.gni')
if not os.path.exists(gni_path):
return False
with open(gni_path) as f:
data = f.read()
args = gn_helpers.FromGNArgs(data)
return args.get('build_with_chromium', False)
def Initialize(output_directory=None, custom_deps=None, adb_path=None): def Initialize(output_directory=None, custom_deps=None, adb_path=None):
"""Initializes devil with chromium's binaries and third-party libraries. """Initializes devil with chromium's binaries and third-party libraries.
...@@ -170,18 +134,26 @@ def Initialize(output_directory=None, custom_deps=None, adb_path=None): ...@@ -170,18 +134,26 @@ def Initialize(output_directory=None, custom_deps=None, adb_path=None):
adb_path: An optional path to use for the adb binary. If not set, this uses adb_path: An optional path to use for the adb binary. If not set, this uses
the adb binary provided by the Android SDK. the adb binary provided by the Android SDK.
""" """
build_with_chromium = _BuildWithChromium()
devil_dynamic_config = { devil_dynamic_config = {
'config_type': 'BaseConfig', 'config_type': 'BaseConfig',
'dependencies': {}, 'dependencies': {},
} }
if build_with_chromium and output_directory: if output_directory:
# Non-chromium users of chromium's //build directory fetch build products output_directory = os.path.abspath(output_directory)
# from google storage rather than use locally built copies. Chromium uses devil_dynamic_config['dependencies'] = {
# locally-built copies so that changes to the tools can be easily tested. dep_name: {
_UseLocalBuildProducts(output_directory, devil_dynamic_config) 'file_info': {
'%s_%s' % (dep_config['platform'], dep_config['arch']): {
'local_paths': [
os.path.join(output_directory, *dep_config['path_components']),
],
}
for dep_config in dep_configs
}
}
for dep_name, dep_configs in _DEVIL_BUILD_PRODUCT_DEPS.iteritems()
}
if custom_deps: if custom_deps:
devil_dynamic_config['dependencies'].update(custom_deps) devil_dynamic_config['dependencies'].update(custom_deps)
if adb_path: if adb_path:
...@@ -195,6 +167,5 @@ def Initialize(output_directory=None, custom_deps=None, adb_path=None): ...@@ -195,6 +167,5 @@ def Initialize(output_directory=None, custom_deps=None, adb_path=None):
} }
}) })
config_files = [_DEVIL_CONFIG] if build_with_chromium else None devil_env.config.Initialize(
devil_env.config.Initialize(configs=[devil_dynamic_config], configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG])
config_files=config_files)
build/android/devil_chromium.pydeps
View file @ 6134a131
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
../../third_party/catapult/devil/devil/utils/timeout_retry.py ../../third_party/catapult/devil/devil/utils/timeout_retry.py
../../third_party/catapult/devil/devil/utils/watchdog_timer.py ../../third_party/catapult/devil/devil/utils/watchdog_timer.py
../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py ../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
../gn_helpers.py
devil_chromium.py devil_chromium.py
pylib/__init__.py pylib/__init__.py
pylib/constants/__init__.py pylib/constants/__init__.py
......
build/android/gyp/create_bundle_wrapper_script.py
View file @ 6134a131
...@@ -10,6 +10,11 @@ import os ...@@ -10,6 +10,11 @@ import os
import string import string
import sys import sys
# Import apk_operations even though this script doesn't use it so that
# targets that depend on the wrapper scripts will rebuild when apk_operations
# or its deps change.
sys.path.insert(1, os.path.join(os.path.dirname(__file__), os.pardir))
import apk_operations # pylint: disable=unused-import
from util import build_utils from util import build_utils
SCRIPT_TEMPLATE = string.Template("""\ SCRIPT_TEMPLATE = string.Template("""\
......
build/android/gyp/create_bundle_wrapper_script.pydeps
View file @ 6134a131
# Generated by running: # Generated by running:
# build/print_python_deps.py --root build/android/gyp --output build/android/gyp/create_bundle_wrapper_script.pydeps build/android/gyp/create_bundle_wrapper_script.py # build/print_python_deps.py --root build/android/gyp --output build/android/gyp/create_bundle_wrapper_script.pydeps build/android/gyp/create_bundle_wrapper_script.py
../../../third_party/catapult/common/py_utils/py_utils/__init__.py
../../../third_party/catapult/common/py_utils/py_utils/cloud_storage.py
../../../third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
../../../third_party/catapult/common/py_utils/py_utils/lock.py
../../../third_party/catapult/common/py_utils/py_utils/tempfile_ext.py
../../../third_party/catapult/dependency_manager/dependency_manager/__init__.py
../../../third_party/catapult/dependency_manager/dependency_manager/archive_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/base_config.py
../../../third_party/catapult/dependency_manager/dependency_manager/cloud_storage_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/dependency_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/dependency_manager_util.py
../../../third_party/catapult/dependency_manager/dependency_manager/exceptions.py
../../../third_party/catapult/dependency_manager/dependency_manager/local_path_info.py
../../../third_party/catapult/dependency_manager/dependency_manager/manager.py
../../../third_party/catapult/dependency_manager/dependency_manager/uploader.py
../../../third_party/catapult/devil/devil/__init__.py
../../../third_party/catapult/devil/devil/android/__init__.py
../../../third_party/catapult/devil/devil/android/apk_helper.py
../../../third_party/catapult/devil/devil/android/constants/__init__.py
../../../third_party/catapult/devil/devil/android/constants/chrome.py
../../../third_party/catapult/devil/devil/android/constants/file_system.py
../../../third_party/catapult/devil/devil/android/decorators.py
../../../third_party/catapult/devil/devil/android/device_denylist.py
../../../third_party/catapult/devil/devil/android/device_errors.py
../../../third_party/catapult/devil/devil/android/device_signal.py
../../../third_party/catapult/devil/devil/android/device_temp_file.py
../../../third_party/catapult/devil/devil/android/device_utils.py
../../../third_party/catapult/devil/devil/android/flag_changer.py
../../../third_party/catapult/devil/devil/android/install_commands.py
../../../third_party/catapult/devil/devil/android/logcat_monitor.py
../../../third_party/catapult/devil/devil/android/md5sum.py
../../../third_party/catapult/devil/devil/android/ndk/__init__.py
../../../third_party/catapult/devil/devil/android/ndk/abis.py
../../../third_party/catapult/devil/devil/android/sdk/__init__.py
../../../third_party/catapult/devil/devil/android/sdk/aapt.py
../../../third_party/catapult/devil/devil/android/sdk/adb_wrapper.py
../../../third_party/catapult/devil/devil/android/sdk/build_tools.py
../../../third_party/catapult/devil/devil/android/sdk/bundletool.py
../../../third_party/catapult/devil/devil/android/sdk/intent.py
../../../third_party/catapult/devil/devil/android/sdk/keyevent.py
../../../third_party/catapult/devil/devil/android/sdk/split_select.py
../../../third_party/catapult/devil/devil/android/sdk/version_codes.py
../../../third_party/catapult/devil/devil/android/tools/__init__.py
../../../third_party/catapult/devil/devil/android/tools/script_common.py
../../../third_party/catapult/devil/devil/base_error.py
../../../third_party/catapult/devil/devil/constants/__init__.py
../../../third_party/catapult/devil/devil/constants/exit_codes.py
../../../third_party/catapult/devil/devil/devil_env.py
../../../third_party/catapult/devil/devil/utils/__init__.py
../../../third_party/catapult/devil/devil/utils/cmd_helper.py
../../../third_party/catapult/devil/devil/utils/host_utils.py
../../../third_party/catapult/devil/devil/utils/lazy/__init__.py
../../../third_party/catapult/devil/devil/utils/lazy/weak_constant.py
../../../third_party/catapult/devil/devil/utils/logging_common.py
../../../third_party/catapult/devil/devil/utils/lsusb.py
../../../third_party/catapult/devil/devil/utils/parallelizer.py
../../../third_party/catapult/devil/devil/utils/reraiser_thread.py
../../../third_party/catapult/devil/devil/utils/reset_usb.py
../../../third_party/catapult/devil/devil/utils/run_tests_helper.py
../../../third_party/catapult/devil/devil/utils/timeout_retry.py
../../../third_party/catapult/devil/devil/utils/watchdog_timer.py
../../../third_party/catapult/devil/devil/utils/zip_utils.py
../../../third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
../../../third_party/jinja2/__init__.py
../../../third_party/jinja2/_compat.py
../../../third_party/jinja2/bccache.py
../../../third_party/jinja2/compiler.py
../../../third_party/jinja2/defaults.py
../../../third_party/jinja2/environment.py
../../../third_party/jinja2/exceptions.py
../../../third_party/jinja2/filters.py
../../../third_party/jinja2/idtracking.py
../../../third_party/jinja2/lexer.py
../../../third_party/jinja2/loaders.py
../../../third_party/jinja2/nodes.py
../../../third_party/jinja2/optimizer.py
../../../third_party/jinja2/parser.py
../../../third_party/jinja2/runtime.py
../../../third_party/jinja2/tests.py
../../../third_party/jinja2/utils.py
../../../third_party/jinja2/visitor.py
../../../third_party/markupsafe/__init__.py
../../../third_party/markupsafe/_compat.py
../../../third_party/markupsafe/_native.py
../../gn_helpers.py ../../gn_helpers.py
../../print_python_deps.py
../adb_command_line.py
../apk_operations.py
../convert_dex_profile.py
../devil_chromium.py
../incremental_install/__init__.py
../incremental_install/installer.py
../pylib/__init__.py
../pylib/constants/__init__.py
../pylib/constants/host_paths.py
../pylib/symbols/__init__.py
../pylib/symbols/deobfuscator.py
../pylib/utils/__init__.py
../pylib/utils/app_bundle_utils.py
../pylib/utils/simpleperf.py
../pylib/utils/time_profile.py
bundletool.py
create_bundle_wrapper_script.py create_bundle_wrapper_script.py
dex.py
util/__init__.py util/__init__.py
util/build_utils.py util/build_utils.py
util/md5_check.py
util/resource_utils.py
util/zipalign.py
build/config/android/internal_rules.gni
View file @ 6134a131
...@@ -700,7 +700,7 @@ template("test_runner_script") { ...@@ -700,7 +700,7 @@ template("test_runner_script") {
"deps", "deps",
"public_deps", "public_deps",
]) ])
data_deps = [] data_deps = [ "//tools/android/md5sum" ]
if (defined(invoker.data_deps)) { if (defined(invoker.data_deps)) {
data_deps += invoker.data_deps data_deps += invoker.data_deps
} }
...@@ -726,6 +726,18 @@ template("test_runner_script") { ...@@ -726,6 +726,18 @@ template("test_runner_script") {
generate_android_wrapper(target_name) { generate_android_wrapper(target_name) {
wrapper_script = "$root_build_dir/bin/run_${_test_name}" wrapper_script = "$root_build_dir/bin/run_${_test_name}"
forward_variables_from(invoker,
[
"data_deps",
"deps",
])
if (!defined(deps)) {
deps = []
}
if (!defined(data_deps)) {
data_deps = []
}
executable = "//testing/test_env.py" executable = "//testing/test_env.py"
...@@ -739,14 +751,11 @@ template("test_runner_script") { ...@@ -739,14 +751,11 @@ template("test_runner_script") {
if (defined(invoker.deps)) { if (defined(invoker.deps)) {
deps = invoker.deps deps = invoker.deps
} }
data_deps = [ "//build/android:test_runner_py" ] data_deps = []
if (defined(invoker.data_deps)) { if (defined(invoker.data_deps)) {
data_deps += invoker.data_deps data_deps = invoker.data_deps
} }
data = [ "//testing/test_env.py" ] data = [ "//testing/test_env.py" ]
if (defined(invoker.data)) {
data += invoker.data
}
executable_args = [ executable_args = [
"@WrappedPath(" + rebase_path(_runner_script, root_build_dir) + ")", "@WrappedPath(" + rebase_path(_runner_script, root_build_dir) + ")",
...@@ -754,6 +763,10 @@ template("test_runner_script") { ...@@ -754,6 +763,10 @@ template("test_runner_script") {
"--output-directory", "--output-directory",
"@WrappedPath(.)", "@WrappedPath(.)",
] ]
data_deps += [
"//build/android:logdog_wrapper_py",
"//build/android:test_runner_py",
]
if (_runtime_deps) { if (_runtime_deps) {
deps += [ ":$_runtime_deps_target" ] deps += [ ":$_runtime_deps_target" ]
......
build/config/android/rules.gni
View file @ 6134a131
...@@ -3305,6 +3305,7 @@ if (enable_java_templates) { ...@@ -3305,6 +3305,7 @@ if (enable_java_templates) {
_generated_script = "$root_build_dir/bin/${invoker.target_name}" _generated_script = "$root_build_dir/bin/${invoker.target_name}"
script = "//build/android/gyp/create_apk_operations_script.py" script = "//build/android/gyp/create_apk_operations_script.py"
outputs = [ _generated_script ] outputs = [ _generated_script ]
data_deps = [ "//tools/android/md5sum" ]
args = [ args = [
"--script-output-path", "--script-output-path",
rebase_path(_generated_script, root_build_dir), rebase_path(_generated_script, root_build_dir),
...@@ -3338,12 +3339,9 @@ if (enable_java_templates) { ...@@ -3338,12 +3339,9 @@ if (enable_java_templates) {
_static_library_apk_path, _static_library_apk_path,
] ]
} }
data = [] if (!defined(data)) {
data_deps = [ data = []
"//build/android:apk_operations_py", }
"//build/android:stack_tools",
]
if (_proguard_enabled && !_incremental_apk) { if (_proguard_enabled && !_incremental_apk) {
# Required by logcat command. # Required by logcat command.
data_deps += [ "//build/android/stacktrace:java_deobfuscate" ] data_deps += [ "//build/android/stacktrace:java_deobfuscate" ]
...@@ -3410,6 +3408,10 @@ if (enable_java_templates) { ...@@ -3410,6 +3408,10 @@ if (enable_java_templates) {
data_deps += [ ":${target_name}__lint" ] data_deps += [ ":${target_name}__lint" ]
} }
if (_incremental_apk) {
# device/commands is used by the installer script to push files via .zip.
data_deps += [ "//build/android/pylib/device/commands" ]
}
if (_uses_static_library) { if (_uses_static_library) {
data_deps += [ invoker.static_library_provider ] data_deps += [ invoker.static_library_provider ]
} }
...@@ -3777,6 +3779,8 @@ if (enable_java_templates) { ...@@ -3777,6 +3779,8 @@ if (enable_java_templates) {
# symbolization can be done. # symbolization can be done.
":${target_name}__secondary_abi_shared_library_list", ":${target_name}__secondary_abi_shared_library_list",
":${target_name}__shared_library_list", ":${target_name}__shared_library_list",
"//build/android/pylib/device/commands",
"//tools/android/forwarder2",
] ]
if (defined(invoker.data_deps)) { if (defined(invoker.data_deps)) {
data_deps += invoker.data_deps data_deps += invoker.data_deps
...@@ -3954,6 +3958,10 @@ if (enable_java_templates) { ...@@ -3954,6 +3958,10 @@ if (enable_java_templates) {
"//base:base_java", "//base:base_java",
"//testing/android/reporter:reporter_java", "//testing/android/reporter:reporter_java",
] ]
data_deps += [ "//build/android/pylib/device/commands" ]
if (host_os == "linux") {
data_deps += [ "//tools/android/forwarder2" ]
}
} }
} }
...@@ -4976,8 +4984,8 @@ if (enable_java_templates) { ...@@ -4976,8 +4984,8 @@ if (enable_java_templates) {
_bundle_path, _bundle_path,
] ]
data_deps = [ data_deps = [
"//build/android:apk_operations_py", "//build/android:bundle_wrapper_script_py",
"//build/android:stack_tools", "//tools/android/md5sum",
] ]
deps = [ _base_module_build_config_target ] deps = [ _base_module_build_config_target ]
......
chrome/android/monochrome/scripts/monochrome_python_tests.pydeps
View file @ 6134a131
# Generated by running: # Generated by running:
# build/print_python_deps.py --output chrome/android/monochrome/scripts/monochrome_python_tests.pydeps --gn-paths chrome/android/monochrome/scripts # build/print_python_deps.py --gn-paths chrome/android/monochrome/scripts
//build/android/devil_chromium.py //build/android/devil_chromium.py
//build/android/pylib/__init__.py //build/android/pylib/__init__.py
//build/android/pylib/constants/__init__.py //build/android/pylib/constants/__init__.py
//build/android/pylib/constants/host_paths.py //build/android/pylib/constants/host_paths.py
//build/gn_helpers.py
//chrome/android/monochrome/scripts/monochrome_android_manifest_test.py //chrome/android/monochrome/scripts/monochrome_android_manifest_test.py
//chrome/android/monochrome/scripts/monochrome_apk_checker_test.py //chrome/android/monochrome/scripts/monochrome_apk_checker_test.py
//chrome/android/monochrome/scripts/monochrome_dexdump_test.py //chrome/android/monochrome/scripts/monochrome_dexdump_test.py
......
chrome/test/chromedriver/test/run_py_tests.pydeps
View file @ 6134a131
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
../../../../build/android/pylib/__init__.py ../../../../build/android/pylib/__init__.py
../../../../build/android/pylib/constants/__init__.py ../../../../build/android/pylib/constants/__init__.py
../../../../build/android/pylib/constants/host_paths.py ../../../../build/android/pylib/constants/host_paths.py
../../../../build/gn_helpers.py
../../../../third_party/catapult/common/py_utils/py_utils/__init__.py ../../../../third_party/catapult/common/py_utils/py_utils/__init__.py
../../../../third_party/catapult/common/py_utils/py_utils/cloud_storage.py ../../../../third_party/catapult/common/py_utils/py_utils/cloud_storage.py
../../../../third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py ../../../../third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
......
testing/scripts/run_android_wpt.pydeps
View file @ 6134a131
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
//build/android/pylib/__init__.py //build/android/pylib/__init__.py
//build/android/pylib/constants/__init__.py //build/android/pylib/constants/__init__.py
//build/android/pylib/constants/host_paths.py //build/android/pylib/constants/host_paths.py
//build/gn_helpers.py
//testing/scripts/common.py //testing/scripts/common.py
//testing/scripts/run_android_wpt.py //testing/scripts/run_android_wpt.py
//testing/scripts/wpt_common.py //testing/scripts/wpt_common.py
......
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