Delete chrome_public_modern_apk
Leaves chrome_public_modern_bundle (not sure if we want to change this). Leaves chrome_public_apk, because that is what people (and bots) are used to using. TBR=dpranke # Holiday and want to fix downstream. Bug: 1097998 Change-Id: I9f7afbdc2ab027066507b1e64021c6722de55a87 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2258364 Commit-Queue: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Ben Mason <benmason@chromium.org> Cr-Commit-Position: refs/heads/master@{#785066}
This commit is contained in:
Andrew Grieve
committed by
Commit Bot
Commit Bot
parent
d5166af880
commit
cdbc63e812
chrome/android
docs
testing/buildbot
tools/android/build_speed
@ -48,7 +48,7 @@ if (android_channel != "default") {
|
||||
|
||||
declare_args() {
|
||||
# Android package name to use when compiling the public chrome targets
|
||||
# (chrome_modern_public_apk, monochrome_public_apk, etc. as well as the
|
||||
# (chrome_public_apk, monochrome_public_apk, etc. as well as the
|
||||
# *_bundle variants). This is particularly useful when using
|
||||
# monochrome_public_apk for WebView development, as the OS only accepts
|
||||
# WebView providers which declare one of a handful of package names. See
|
||||
@ -63,8 +63,6 @@ chrome_public_jinja_variables =
|
||||
[ "manifest_package=$chrome_public_manifest_package" ]
|
||||
chrome_public_android_manifest =
|
||||
"$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
|
||||
chrome_modern_public_android_manifest =
|
||||
"$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml"
|
||||
trichrome_library_android_manifest =
|
||||
"$target_gen_dir/trichrome_library_apk/AndroidManifest.xml"
|
||||
trichrome_library_32_64_android_manifest =
|
||||
@ -113,16 +111,6 @@ jinja_template("chrome_public_android_manifest") {
|
||||
]
|
||||
}
|
||||
|
||||
jinja_template("chrome_modern_public_android_manifest") {
|
||||
input = "java/AndroidManifest.xml"
|
||||
output = chrome_modern_public_android_manifest
|
||||
variables = chrome_public_jinja_variables
|
||||
variables += [
|
||||
"min_sdk_version=21",
|
||||
"target_sdk_version=$android_sdk_version",
|
||||
]
|
||||
}
|
||||
|
||||
jinja_template("trichrome_library_android_manifest") {
|
||||
input = "java/AndroidManifest_trichrome_library.xml"
|
||||
output = trichrome_library_android_manifest
|
||||
@ -1870,9 +1858,8 @@ static_library("browser_test_support") {
|
||||
}
|
||||
|
||||
# Defines a target that derives from the chrome public application. This
|
||||
# can be either an APK or an app bundle module. This supports both the
|
||||
# chrome_public_xxx targets (for Android J-K) and chrome_modern_public_xxx
|
||||
# ones (for Android L-M). For Android N+, see instead
|
||||
# can be either an APK or an app bundle module. This supports
|
||||
# chrome_public_xxx targets (for Android L-M). For Android N+, see instead
|
||||
# monochrome_public_apk_or_module_tmpl() below.
|
||||
#
|
||||
# Variables:
|
||||
@ -1883,10 +1870,7 @@ static_library("browser_test_support") {
|
||||
# is_base_module: For 'android_app_bundle_module' target types only,
|
||||
# set to true to indicate that this is a base application module
|
||||
# (instead of a feature module).
|
||||
# is_modern: Optional. Set to true to indicate that this is a Chrome-modern
|
||||
# target, intended for Android L and M only.
|
||||
template("chrome_public_apk_or_module_tmpl") {
|
||||
_is_modern = defined(invoker.is_modern) && invoker.is_modern
|
||||
_is_bundle_module = invoker.target_type == "android_app_bundle_module"
|
||||
chrome_public_common_apk_or_module_tmpl(target_name) {
|
||||
forward_variables_from(invoker,
|
||||
@ -1895,16 +1879,10 @@ template("chrome_public_apk_or_module_tmpl") {
|
||||
"bundle_target",
|
||||
"is_base_module",
|
||||
"jni_registration_header",
|
||||
"is_modern",
|
||||
"target_type",
|
||||
"enable_multidex",
|
||||
"lint_suppressions_dep",
|
||||
"lint_suppressions_file",
|
||||
|
||||
# TODO(crbug.com/1076896): remove
|
||||
# "disable_library_rename" when we remove chrome
|
||||
# public apk.
|
||||
"disable_library_rename",
|
||||
])
|
||||
deps = _chrome_public_shared_deps
|
||||
if (_is_bundle_module) {
|
||||
@ -1913,13 +1891,8 @@ template("chrome_public_apk_or_module_tmpl") {
|
||||
deps += [ ":chrome_apk_pak_assets" ]
|
||||
}
|
||||
|
||||
if (_is_modern) {
|
||||
android_manifest = chrome_modern_public_android_manifest
|
||||
android_manifest_dep = ":chrome_modern_public_android_manifest"
|
||||
} else {
|
||||
android_manifest = chrome_public_android_manifest
|
||||
android_manifest_dep = ":chrome_public_android_manifest"
|
||||
}
|
||||
android_manifest = chrome_public_android_manifest
|
||||
android_manifest_dep = ":chrome_public_android_manifest"
|
||||
|
||||
shared_libraries = [ ":libchrome" ]
|
||||
|
||||
@ -1928,38 +1901,21 @@ template("chrome_public_apk_or_module_tmpl") {
|
||||
# platform bug, where overzealous SELinux settings prevent mapping some apk
|
||||
# file segments with PROT_EXEC (see http://crbug.com/398425). This was
|
||||
# fixed for Android L by adding proper CTS tests.
|
||||
load_library_from_apk = _is_modern && chromium_linker_supported
|
||||
load_library_from_apk = chromium_linker_supported
|
||||
|
||||
version_name = chrome_version_name
|
||||
}
|
||||
}
|
||||
|
||||
# The chrome_public and chrome_modern_public APKs and bundle modules
|
||||
|
||||
chrome_public_apk_or_module_tmpl("chrome_public_apk") {
|
||||
target_type = "android_apk"
|
||||
apk_name = "ChromePublic"
|
||||
enable_multidex = is_java_debug
|
||||
if (android_64bit_target_cpu) {
|
||||
disable_library_rename = true
|
||||
}
|
||||
}
|
||||
|
||||
android_resource_sizes_test("resource_sizes_chrome_public_apk") {
|
||||
apk_name = "ChromePublic"
|
||||
data_deps = [ ":chrome_public_apk" ]
|
||||
}
|
||||
|
||||
chrome_public_apk_or_module_tmpl("chrome_modern_public_apk") {
|
||||
target_type = "android_apk"
|
||||
apk_name = "ChromeModernPublic"
|
||||
is_modern = true
|
||||
}
|
||||
|
||||
chrome_public_apk_or_module_tmpl("chrome_modern_public_base_bundle_module") {
|
||||
target_type = "android_app_bundle_module"
|
||||
is_base_module = true
|
||||
is_modern = true
|
||||
bundle_target = ":chrome_modern_public_bundle"
|
||||
}
|
||||
|
||||
@ -2452,12 +2408,6 @@ instrumentation_test_runner("chrome_public_smoke_test") {
|
||||
android_test_apk_name = "ChromeSmokeTest"
|
||||
}
|
||||
|
||||
instrumentation_test_runner("chrome_modern_public_smoke_test") {
|
||||
apk_under_test = ":chrome_modern_public_apk"
|
||||
android_test_apk = ":chrome_smoke_test_apk"
|
||||
android_test_apk_name = "ChromeSmokeTest"
|
||||
}
|
||||
|
||||
# Public webview targets don't work with non-public sdks.
|
||||
# https://crbug.com/1000763
|
||||
if (public_android_sdk) {
|
||||
|
||||
@ -45,8 +45,6 @@ _add_unwind_tables_in_chrome_32bit_apk =
|
||||
# the final target (e.g. [ ":libchrome" ]).
|
||||
# add_unwind_tables_in_apk: Optional. If true, add the unwind tables to the
|
||||
# final APK or bundle.
|
||||
# is_modern: If true, indicates this corresponds to a chrome_modern_XXX
|
||||
# target that can only run on Android L-M.
|
||||
# is_monochrome: Indicates that this target contains chrome and webview
|
||||
# packaged together and can only run on Android N+.
|
||||
# is_trichrome: Indicates this target relies on a trichrome static library
|
||||
@ -69,15 +67,11 @@ template("chrome_public_common_apk_or_module_tmpl") {
|
||||
invoker.target_type == "instrumentation_test_apk",
|
||||
"Invalid target_type definition, should be 'android_apk' or 'android_app_bundle_module'")
|
||||
|
||||
_is_modern = defined(invoker.is_modern) && invoker.is_modern
|
||||
_is_monochrome = defined(invoker.is_monochrome) && invoker.is_monochrome
|
||||
_is_trichrome = defined(invoker.is_trichrome) && invoker.is_trichrome
|
||||
_is_64_bit_browser =
|
||||
defined(invoker.is_64_bit_browser) && invoker.is_64_bit_browser
|
||||
not_needed([
|
||||
"_is_modern",
|
||||
"_is_64_bit_browser",
|
||||
])
|
||||
not_needed([ "_is_64_bit_browser" ])
|
||||
assert(!(_is_monochrome && _is_trichrome),
|
||||
"Cannot be both trichrome and monochrome!")
|
||||
assert(_is_trichrome == defined(invoker.static_library_provider),
|
||||
@ -141,9 +135,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
|
||||
}
|
||||
|
||||
target(_target_type, target_name) {
|
||||
# TODO(crbug.com/1076896): remove "disable_library_rename" after
|
||||
# chrome_public_apk is removed
|
||||
forward_variables_from(invoker, "*", [ "disable_library_rename" ])
|
||||
forward_variables_from(invoker, "*")
|
||||
if (defined(shared_resources_whitelist_target)) {
|
||||
shared_resources_allowlist_target = shared_resources_whitelist_target
|
||||
shared_resources_allowlist_locales = shared_resources_whitelist_locales
|
||||
@ -153,8 +145,6 @@ template("chrome_public_common_apk_or_module_tmpl") {
|
||||
min_sdk_version = 29
|
||||
} else if (_is_monochrome) {
|
||||
min_sdk_version = 24
|
||||
} else if (_is_modern) {
|
||||
min_sdk_version = 21
|
||||
} else {
|
||||
min_sdk_version = 21
|
||||
}
|
||||
@ -286,18 +276,11 @@ template("chrome_public_common_apk_or_module_tmpl") {
|
||||
"libchromium_android_linker.so",
|
||||
]
|
||||
|
||||
# TODO(crbug.com/1076896): remove disable_library_rename check after
|
||||
# chrome_public_apk is removed.
|
||||
if (!(defined(invoker.disable_library_rename) &&
|
||||
invoker.disable_library_rename) &&
|
||||
(_is_modern || android_64bit_target_cpu)) {
|
||||
# This adds the "crazy." prefix to avoid the file being extracted upon
|
||||
# install.
|
||||
library_renames = [
|
||||
"libchrome.so",
|
||||
"libchromefortest.so",
|
||||
]
|
||||
}
|
||||
# Adds "crazy." prefix to avoid libraries being extracted when installed.
|
||||
library_renames = [
|
||||
"libchrome.so",
|
||||
"libchromefortest.so",
|
||||
]
|
||||
}
|
||||
|
||||
if (_enable_multidex) {
|
||||
@ -366,12 +349,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
|
||||
}
|
||||
|
||||
if (!defined(load_library_from_apk)) {
|
||||
# Whether native libraries should be loaded from within the apk.
|
||||
# Only attempt loading the library from the APK for 64 bit devices
|
||||
# until the number of 32 bit devices which don't support this
|
||||
# approach falls to a minimal level - http://crbug.com/390618.
|
||||
load_library_from_apk = chromium_linker_supported &&
|
||||
(current_cpu == "arm64" || current_cpu == "x64")
|
||||
load_library_from_apk = chromium_linker_supported
|
||||
}
|
||||
}
|
||||
if (_target_type == "android_apk") {
|
||||
@ -394,6 +372,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
|
||||
} else if (_is_monochrome) {
|
||||
version_code = monochrome_version_code
|
||||
} else {
|
||||
# TODO(agrieve): Merge chrome_modern_version_code with chrome_version_code.
|
||||
version_code = chrome_modern_version_code
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ if (public_android_sdk) {
|
||||
group("monochrome_apk_checker") {
|
||||
testonly = true
|
||||
data_deps = [
|
||||
"//chrome/android:chrome_modern_public_apk",
|
||||
"//chrome/android:chrome_public_apk",
|
||||
"//chrome/android:monochrome_public_apk",
|
||||
]
|
||||
if (public_android_sdk) {
|
||||
|
||||
@ -184,24 +184,20 @@ depending on the version of Android running on a device. Chrome uses this
|
||||
feature to target 4 different versions using 4 different ninja targets:
|
||||
|
||||
1. `chrome_public_apk` (ChromePublic.apk)
|
||||
* `minSdkVersion=19` (KitKat).
|
||||
* Stores libchrome.so compressed within the APK.
|
||||
* Uses [Crazy Linker](https://cs.chromium.org/chromium/src/base/android/linker/BUILD.gn?rcl=6bb29391a86f2be58c626170156cbfaa2cbc5c91&l=9).
|
||||
* Shipped only for Android < 21, but still works fine on Android >= 21.
|
||||
2. `chrome_modern_public_apk` (ChromeModernPublic.apk)
|
||||
* `minSdkVersion=21` (Lollipop).
|
||||
* Uses [Crazy Linker](https://cs.chromium.org/chromium/src/base/android/linker/BUILD.gn?rcl=6bb29391a86f2be58c626170156cbfaa2cbc5c91&l=9).
|
||||
* Stores libchrome.so uncompressed within the APK.
|
||||
* This APK is bigger, but the installation size is smaller since there is
|
||||
no need to extract the .so file.
|
||||
3. `monochrome_public_apk` (MonochromePublic.apk)
|
||||
* Historically known as "chrome_modern_public_apk".
|
||||
2. `monochrome_public_apk` (MonochromePublic.apk)
|
||||
* `minSdkVersion=24` (Nougat).
|
||||
* Contains both WebView and Chrome within the same APK.
|
||||
* This APK is even bigger, but much smaller than SystemWebView.apk + ChromePublic.apk.
|
||||
* Stores libmonochrome.so uncompressed within the APK.
|
||||
* Does not use Crazy Linker (WebView requires system linker).
|
||||
* But system linker supports crazy linker features now anyways.
|
||||
4. `trichrome_chrome_bundle` and `trichrome_library_apk` (TrichromeChrome.aab and TrichromeLibrary.apk)
|
||||
3. `trichrome_chrome_bundle` and `trichrome_library_apk` (TrichromeChrome.aab and TrichromeLibrary.apk)
|
||||
* `minSdkVersion=Q` (Q).
|
||||
* TrichromeChrome contains only the Chrome code that is not shared with WebView.
|
||||
* TrichromeLibrary contains the shared code and is a "static shared library APK", which must be installed prior to TrichromeChrome.
|
||||
|
||||
@ -202,7 +202,6 @@ that crashed was built. When building locally, these are found in:
|
||||
|
||||
```shell
|
||||
out/Default/apks/ChromePublic.apk.mapping
|
||||
out/Default/apks/ChromeModernPublic.apk.mapping
|
||||
etc.
|
||||
```
|
||||
|
||||
|
||||
@ -5,9 +5,7 @@ Chrome on Android.
|
||||
[TOC]
|
||||
|
||||
## Library Packaging
|
||||
* Android J & K (ChromePublic.apk):
|
||||
* `libchrome.so` is stored compressed and extracted by Android during installation.
|
||||
* Android L & M (ChromeModernPublic.apk):
|
||||
* Android L & M (ChromePublic.apk):
|
||||
* `libchrome.so` is stored uncompressed within the apk (with the name `crazy.libchrome.so` to avoid extraction).
|
||||
* It is loaded directly from the apk (without extracting) by `mmap()`'ing it.
|
||||
* Android N, O & P (MonochromePublic.apk):
|
||||
@ -19,7 +17,7 @@ Chrome on Android.
|
||||
The packaging above extends to cover both 32-bit and 64-bit device
|
||||
configurations.
|
||||
|
||||
Chrome and ChromeModern support 64-bit builds, but these do not ship to Stable.
|
||||
Chrome support 64-bit builds, but these do not ship to Stable.
|
||||
The system Webview APK that ships to those devices contains a 32-bit library,
|
||||
and for 64-bit devices, a 64-bit library as well (32-bit Webview client apps
|
||||
will use the 32-bit library, and vice-versa).
|
||||
@ -79,7 +77,7 @@ Builds on | Variant | Chrome | Library | Webview
|
||||
* Crashpad is a native library providing out-of-process crash dumping. When a
|
||||
dump is requested (e.g. after a crash), a Crashpad handler process is started
|
||||
to produce a dump.
|
||||
* Chrome and ChromeModern (Android J through M):
|
||||
* Chrome (Android L through M):
|
||||
* libchrome_crashpad_handler.so is a standalone executable containing all of
|
||||
the crash dumping code. It is stored compressed and extracted automatically
|
||||
by the system, allowing it to be directly executed to produce a crash dump.
|
||||
@ -131,7 +129,7 @@ Builds on | Variant | Chrome | Library | Webview
|
||||
* To facilitate heap profiling, we ship unwind information to arm32 canary & dev channels as a separate file: `assets/unwind_cfi_32`
|
||||
|
||||
## JNI Native Methods Resolution
|
||||
* For ChromePublic.apk and ChromeModernPublic.apk:
|
||||
* For ChromePublic.apk:
|
||||
* `JNI_OnLoad()` is the only exported symbol (enforced by a linker script).
|
||||
* Native methods registered explicitly during start-up by generated code.
|
||||
* Explicit generation is required because the Android runtime uses the system's `dlsym()`, which doesn't know about Crazy-Linker-opened libraries.
|
||||
|
||||
@ -2689,53 +2689,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "LMY48M|LMY48I",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "hammerhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"expiration": 10800,
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -6262,53 +6215,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "LMY49B",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "flo",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"expiration": 21600,
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -9558,52 +9464,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -13072,53 +12932,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MRA58Z",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "flo",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"expiration": 10800,
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -17341,52 +17154,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -25764,53 +25531,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -29411,65 +29131,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices",
|
||||
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"cpu": "x86-64",
|
||||
"device_os": null,
|
||||
"device_type": null,
|
||||
"machine_type": "n1-standard-8",
|
||||
"os": "Ubuntu-16.04",
|
||||
"pool": "chromium.tests.avd"
|
||||
}
|
||||
],
|
||||
"named_caches": [
|
||||
{
|
||||
"name": "avd_generic_android23",
|
||||
"path": ".android"
|
||||
},
|
||||
{
|
||||
"name": "system_images_android_23_google_apis_x86",
|
||||
"path": ".emulator_sdk"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
|
||||
@ -51363,53 +51363,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "LMY48M|LMY48I",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "hammerhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"expiration": 10800,
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -54936,53 +54889,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "LMY49B",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "flo",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"expiration": 21600,
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -83032,52 +82938,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -86546,53 +86406,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MRA58Z",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "flo",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"expiration": 10800,
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -159776,52 +159589,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -166383,53 +166150,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -177127,53 +176847,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
@ -181165,65 +180838,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices",
|
||||
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"cpu": "x86-64",
|
||||
"device_os": null,
|
||||
"device_type": null,
|
||||
"machine_type": "n1-standard-8",
|
||||
"os": "Ubuntu-16.04",
|
||||
"pool": "chromium.tests.avd"
|
||||
}
|
||||
],
|
||||
"named_caches": [
|
||||
{
|
||||
"name": "avd_generic_android23",
|
||||
"path": ".android"
|
||||
},
|
||||
{
|
||||
"name": "system_images_android_23_google_apis_x86",
|
||||
"path": ".emulator_sdk"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
|
||||
@ -6524,53 +6524,6 @@
|
||||
"test": "chrome_modern_public_bundle_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_bundle_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
"--recover-devices"
|
||||
],
|
||||
"isolate_profile_data": true,
|
||||
"merge": {
|
||||
"args": [
|
||||
"--bucket",
|
||||
"chromium-result-details",
|
||||
"--test-name",
|
||||
"chrome_modern_public_smoke_test"
|
||||
],
|
||||
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
|
||||
},
|
||||
"swarming": {
|
||||
"can_use_on_swarming_builders": true,
|
||||
"cipd_packages": [
|
||||
{
|
||||
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
||||
"location": "bin",
|
||||
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
|
||||
}
|
||||
],
|
||||
"dimension_sets": [
|
||||
{
|
||||
"device_os": "MMB29Q",
|
||||
"device_os_type": "userdebug",
|
||||
"device_type": "bullhead",
|
||||
"os": "Android"
|
||||
}
|
||||
],
|
||||
"output_links": [
|
||||
{
|
||||
"link": [
|
||||
"https://luci-logdog.appspot.com/v/?s",
|
||||
"=android%2Fswarming%2Flogcats%2F",
|
||||
"${TASK_ID}%2F%2B%2Funified_logcats"
|
||||
],
|
||||
"name": "shard #${SHARD_INDEX} logcats"
|
||||
}
|
||||
],
|
||||
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
|
||||
},
|
||||
"test": "chrome_modern_public_smoke_test",
|
||||
"test_id_prefix": "ninja://chrome/android:chrome_modern_public_smoke_test/"
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--gs-results-bucket=chromium-result-details",
|
||||
|
||||
@ -433,10 +433,6 @@
|
||||
"label": "//chrome/android:chrome_junit_tests",
|
||||
"type": "junit_test",
|
||||
},
|
||||
"chrome_modern_public_smoke_test": {
|
||||
"label": "//chrome/android:chrome_modern_public_smoke_test",
|
||||
"type": "console_test_launcher",
|
||||
},
|
||||
"chrome_modern_public_bundle_smoke_test": {
|
||||
"label": "//chrome/android:chrome_modern_public_bundle_smoke_test",
|
||||
"type": "console_test_launcher",
|
||||
@ -1243,9 +1239,9 @@
|
||||
"--script",
|
||||
"../../chrome/android/monochrome/scripts/monochrome_apk_checker.py",
|
||||
"--chrome-apk",
|
||||
"apks/ChromeModernPublic.apk",
|
||||
"apks/ChromePublic.apk",
|
||||
"--chrome-pathmap",
|
||||
"apks/ChromeModernPublic.apk.pathmap.txt",
|
||||
"apks/ChromePublic.apk.pathmap.txt",
|
||||
"--system-webview-apk",
|
||||
"apks/SystemWebView.apk",
|
||||
"--system-webview-pathmap",
|
||||
|
||||
@ -158,7 +158,6 @@
|
||||
'android_modern_smoke_tests': {
|
||||
'chrome_modern_public_bundle_fake_modules_smoke_test': {},
|
||||
'chrome_modern_public_bundle_smoke_test': {},
|
||||
'chrome_modern_public_smoke_test': {},
|
||||
},
|
||||
|
||||
'android_monochrome_smoke_tests': {
|
||||
|
||||
@ -62,35 +62,35 @@ _BENCHMARKS = {
|
||||
},
|
||||
'chrome_java_nosig': {
|
||||
'kind': 'incremental',
|
||||
'target': 'chrome_modern_public_apk',
|
||||
'target': 'chrome_public_apk',
|
||||
'from_string': '"Url',
|
||||
'to_string': '"Url1',
|
||||
'change_file': _URL_BAR,
|
||||
},
|
||||
'chrome_java_sig': {
|
||||
'kind': 'incremental',
|
||||
'target': 'chrome_modern_public_apk',
|
||||
'target': 'chrome_public_apk',
|
||||
'from_string': 'UrlBar";',
|
||||
'to_string': 'UrlBar";public void NewInterfaceMethod(){}',
|
||||
'change_file': _URL_BAR,
|
||||
},
|
||||
'chrome_java_res': {
|
||||
'kind': 'incremental',
|
||||
'target': 'chrome_modern_public_apk',
|
||||
'target': 'chrome_public_apk',
|
||||
'from_string': '14181C',
|
||||
'to_string': '14181D',
|
||||
'change_file': 'chrome/android/java/res/values/colors.xml',
|
||||
},
|
||||
'base_java_nosig': {
|
||||
'kind': 'incremental',
|
||||
'target': 'chrome_modern_public_apk',
|
||||
'target': 'chrome_public_apk',
|
||||
'from_string': '"SysUtil',
|
||||
'to_string': '"SysUtil1',
|
||||
'change_file': 'base/android/java/src/org/chromium/base/SysUtils.java',
|
||||
},
|
||||
'base_java_sig': {
|
||||
'kind': 'incremental',
|
||||
'target': 'chrome_modern_public_apk',
|
||||
'target': 'chrome_public_apk',
|
||||
'from_string': 'SysUtils";',
|
||||
'to_string': 'SysUtils";public void NewInterfaceMethod(){}',
|
||||
'change_file': 'base/android/java/src/org/chromium/base/SysUtils.java',
|
||||
|
||||
Reference in New Issue
Block a user