Commit 3c339f3a authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

Fix monochrome_public_apk_checker attempt #3

This CL:
- Generates monochrome_python_tests.pydeps using --gn-paths flag
- Adds run_isolated_script_test.py data deps to
  monochrome_public_apk_checker.py
- Adds //testing:run_isolated_script_test target to collect the data
deps for monochrome_public_apk_checker.py

BUG=1138758

Change-Id: Ifffa033368980923e2587e52ff50d35eeae2f271
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2483664Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818597}
parent bfe0f65a
...@@ -1375,6 +1375,7 @@ _GENERIC_PYDEPS_FILES = [ ...@@ -1375,6 +1375,7 @@ _GENERIC_PYDEPS_FILES = [
'content/public/android/generate_child_service.pydeps', 'content/public/android/generate_child_service.pydeps',
'net/tools/testserver/testserver.pydeps', 'net/tools/testserver/testserver.pydeps',
'testing/scripts/run_android_wpt.pydeps', 'testing/scripts/run_android_wpt.pydeps',
'testing/scripts/run_isolated_script_test.pydeps',
'third_party/android_platform/development/scripts/stack.pydeps', 'third_party/android_platform/development/scripts/stack.pydeps',
'third_party/blink/renderer/bindings/scripts/build_web_idl_database.pydeps', 'third_party/blink/renderer/bindings/scripts/build_web_idl_database.pydeps',
'third_party/blink/renderer/bindings/scripts/collect_idl_files.pydeps', 'third_party/blink/renderer/bindings/scripts/collect_idl_files.pydeps',
......
...@@ -12,5 +12,6 @@ python_library("monochrome_public_apk_checker") { ...@@ -12,5 +12,6 @@ python_library("monochrome_public_apk_checker") {
"//android_webview:system_webview_apk", "//android_webview:system_webview_apk",
"//chrome/android:chrome_public_apk", "//chrome/android:chrome_public_apk",
"//chrome/android:monochrome_public_apk", "//chrome/android:monochrome_public_apk",
"//testing:run_isolated_script_test",
] ]
} }
# Generated by running: # Generated by running:
# build/print_python_deps.py 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
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/android/monochrome/scripts/monochrome_python_tests.py //chrome/android/monochrome/scripts/monochrome_python_tests.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
third_party/catapult/common/py_utils/py_utils/lock.py //third_party/catapult/common/py_utils/py_utils/lock.py
third_party/catapult/dependency_manager/dependency_manager/__init__.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/archive_info.py
third_party/catapult/dependency_manager/dependency_manager/base_config.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/cloud_storage_info.py
third_party/catapult/dependency_manager/dependency_manager/dependency_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/dependency_manager_util.py
third_party/catapult/dependency_manager/dependency_manager/exceptions.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/local_path_info.py
third_party/catapult/dependency_manager/dependency_manager/manager.py //third_party/catapult/dependency_manager/dependency_manager/manager.py
third_party/catapult/dependency_manager/dependency_manager/uploader.py //third_party/catapult/dependency_manager/dependency_manager/uploader.py
third_party/catapult/devil/devil/__init__.py //third_party/catapult/devil/devil/__init__.py
third_party/catapult/devil/devil/android/__init__.py //third_party/catapult/devil/devil/android/__init__.py
third_party/catapult/devil/devil/android/constants/__init__.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/chrome.py
third_party/catapult/devil/devil/android/ndk/__init__.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/ndk/abis.py
third_party/catapult/devil/devil/android/sdk/__init__.py //third_party/catapult/devil/devil/android/sdk/__init__.py
third_party/catapult/devil/devil/android/sdk/build_tools.py //third_party/catapult/devil/devil/android/sdk/build_tools.py
third_party/catapult/devil/devil/android/sdk/keyevent.py //third_party/catapult/devil/devil/android/sdk/keyevent.py
third_party/catapult/devil/devil/android/sdk/version_codes.py //third_party/catapult/devil/devil/android/sdk/version_codes.py
third_party/catapult/devil/devil/base_error.py //third_party/catapult/devil/devil/base_error.py
third_party/catapult/devil/devil/constants/__init__.py //third_party/catapult/devil/devil/constants/__init__.py
third_party/catapult/devil/devil/constants/exit_codes.py //third_party/catapult/devil/devil/constants/exit_codes.py
third_party/catapult/devil/devil/devil_env.py //third_party/catapult/devil/devil/devil_env.py
third_party/catapult/devil/devil/utils/__init__.py //third_party/catapult/devil/devil/utils/__init__.py
third_party/catapult/devil/devil/utils/cmd_helper.py //third_party/catapult/devil/devil/utils/cmd_helper.py
third_party/catapult/devil/devil/utils/lazy/__init__.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/lazy/weak_constant.py
third_party/catapult/devil/devil/utils/reraiser_thread.py //third_party/catapult/devil/devil/utils/reraiser_thread.py
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/typ/typ/__init__.py //third_party/catapult/third_party/typ/typ/__init__.py
third_party/catapult/third_party/typ/typ/arg_parser.py //third_party/catapult/third_party/typ/typ/arg_parser.py
third_party/catapult/third_party/typ/typ/artifacts.py //third_party/catapult/third_party/typ/typ/artifacts.py
third_party/catapult/third_party/typ/typ/expectations_parser.py //third_party/catapult/third_party/typ/typ/expectations_parser.py
third_party/catapult/third_party/typ/typ/fakes/__init__.py //third_party/catapult/third_party/typ/typ/fakes/__init__.py
third_party/catapult/third_party/typ/typ/fakes/host_fake.py //third_party/catapult/third_party/typ/typ/fakes/host_fake.py
third_party/catapult/third_party/typ/typ/host.py //third_party/catapult/third_party/typ/typ/host.py
third_party/catapult/third_party/typ/typ/json_results.py //third_party/catapult/third_party/typ/typ/json_results.py
third_party/catapult/third_party/typ/typ/pool.py //third_party/catapult/third_party/typ/typ/pool.py
third_party/catapult/third_party/typ/typ/printer.py //third_party/catapult/third_party/typ/typ/printer.py
third_party/catapult/third_party/typ/typ/python_2_3_compat.py //third_party/catapult/third_party/typ/typ/python_2_3_compat.py
third_party/catapult/third_party/typ/typ/runner.py //third_party/catapult/third_party/typ/typ/runner.py
third_party/catapult/third_party/typ/typ/stats.py //third_party/catapult/third_party/typ/typ/stats.py
third_party/catapult/third_party/typ/typ/test_case.py //third_party/catapult/third_party/typ/typ/test_case.py
third_party/catapult/third_party/typ/typ/version.py //third_party/catapult/third_party/typ/typ/version.py
third_party/catapult/third_party/zipfile/zipfile_2_7_13.py //third_party/catapult/third_party/zipfile/zipfile_2_7_13.py
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/python.gni")
# Used by linux-gcc-rel to ensure gcc doesn't choke on clang-only flags. # Used by linux-gcc-rel to ensure gcc doesn't choke on clang-only flags.
executable("empty_main") { executable("empty_main") {
sources = [ "empty_main.cc" ] sources = [ "empty_main.cc" ]
...@@ -35,3 +37,8 @@ group("run_perf_test") { ...@@ -35,3 +37,8 @@ group("run_perf_test") {
data_deps += [ "//third_party/jdk:java_data" ] data_deps += [ "//third_party/jdk:java_data" ]
} }
} }
python_library("run_isolated_script_test") {
testonly = true
pydeps_file = "//testing/scripts/run_isolated_script_test.pydeps"
}
# Generated by running:
# build/print_python_deps.py --gn-paths testing/scripts/run_isolated_script_test.py
//testing/scripts/common.py
//testing/scripts/run_isolated_script_test.py
//testing/test_env.py
//testing/xvfb.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