Commit da2f1110 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

Rename monochrome_apk_checker to monochrome_public_apk_checker

This is in preparation for a new tester which tests Monochrome.apk

BUG=1115604

Change-Id: I8e817c1d4ae88c5b410aca502172f881c0864975
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460714
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815495}
parent 9ef99ad9
......@@ -339,7 +339,7 @@ group("gn_all") {
"//build/android/gyp/test:hello_world",
"//build/android/stacktrace:java_deobfuscate",
"//build/config/android/test/proto:test_build_protos",
"//chrome/android/monochrome:monochrome_apk_checker",
"//chrome/android/monochrome:monochrome_public_apk_checker",
"//chrome/android/webapk/shell_apk:maps_go_webapk",
"//chrome/android/webapk/shell_apk:webapk",
"//chrome/android/webapk/shell_apk/prepare_upload_dir:prepare_webapk_shell_upload_dir",
......
......@@ -2769,7 +2769,7 @@ if (enable_java_templates) {
sources = [ _resources_path_map_out_path ]
outputs = [ _final_pathmap_path ]
# The monochrome_apk_checker test needs pathmap when run on swarming.
# The monochrome_public_apk_checker test needs pathmap when run on swarming.
data = [ _final_pathmap_path ]
}
_final_deps += [ ":$_copy_pathmap_target" ]
......
......@@ -4,7 +4,7 @@
import("//build/config/android/config.gni")
group("monochrome_apk_checker") {
group("monochrome_public_apk_checker") {
testonly = true
data_deps = [
"//android_webview:system_webview_apk",
......
......@@ -20401,12 +20401,12 @@
],
"isolated_scripts": [
{
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -20417,7 +20417,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
}
],
"junit_tests": [
......@@ -33783,12 +33783,12 @@
"args": [
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
],
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -33813,7 +33813,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
}
]
},
......@@ -37383,12 +37383,12 @@
"test_id_prefix": "ninja://content/shell:content_shell_crash_test/"
},
{
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -37401,7 +37401,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
},
{
"args": [
......@@ -8104,12 +8104,12 @@
],
"isolated_scripts": [
{
"isolate_name": "monochrome_apk_checker",
"isolate_name": "monochrome_public_apk_checker",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "monochrome_apk_checker",
"name": "monochrome_public_apk_checker",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -8120,7 +8120,7 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_apk_checker/"
"test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
}
],
"junit_tests": [
......@@ -1247,7 +1247,7 @@
"label": "//mojo:mojo_unittests",
"type": "console_test_launcher",
},
"monochrome_apk_checker": {
"monochrome_public_apk_checker": {
"args": [
"../../chrome/android/monochrome/scripts/monochrome_python_tests.py",
"--chrome-apk",
......@@ -1263,7 +1263,7 @@
"--monochrome-pathmap",
"apks/MonochromePublic.apk.pathmap.txt",
],
"label": "//chrome/android/monochrome:monochrome_apk_checker",
"label": "//chrome/android/monochrome:monochrome_public_apk_checker",
"script": "//testing/scripts/run_isolated_script_test.py",
"type": "script",
},
......
......@@ -1650,7 +1650,7 @@
},
},
},
'monochrome_apk_checker': {
'monochrome_public_apk_checker': {
'modifications': {
'ToTAndroid': {
'swarming': {
......
......@@ -3502,8 +3502,8 @@
'services_unittests': {},
},
'monochrome_apk_checker_isolated_script': {
'monochrome_apk_checker': {},
'monochrome_public_apk_checker_isolated_script': {
'monochrome_public_apk_checker': {},
},
# These tests will be run on the main waterfall.
......@@ -5506,7 +5506,7 @@
'marshmallow_nougat_pie_isolated_scripts_with_proguard': [
'android_isolated_scripts',
'components_perftests_isolated_scripts',
'monochrome_apk_checker_isolated_script',
'monochrome_public_apk_checker_isolated_script',
'telemetry_android_minidump_unittests_isolated_scripts',
'telemetry_perf_unittests_isolated_scripts',
],
......
......@@ -763,7 +763,7 @@
'test_suites': {
'gtest_tests': 'android_lollipop_marshmallow_gtests',
'junit_tests': 'chromium_junit_tests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script',
'isolated_scripts': 'monochrome_public_apk_checker_isolated_script',
},
'os_type': 'android',
},
......@@ -1280,7 +1280,7 @@
'test_suites': {
'gtest_tests': 'chromium_android_gtests',
'junit_tests': 'chromium_junit_tests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script',
'isolated_scripts': 'monochrome_public_apk_checker_isolated_script',
},
'os_type': 'android',
},
......
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