Commit 63147b70 authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Reland "Fix WebView shell APK not being found on perf bots"

This is a reland of e5f83907

This was not actually the culprit that broke perf bots. The bots turned
green before the revert had landed:
https://ci.chromium.org/p/chrome/builders/ci/android-pixel2_webview-perf/12328

Original change's description:
> Fix WebView shell APK not being found on perf bots
>
> All of these APKs are now defined unconditionally since
> http://crrev.com/c/2173947 and http://crrev.com/c/2281021. It no longer
> makes sense to guard these with public_android_sdk, and this seemed to
> be causing some flakiness where the bots sometimes could not find the
> correct APKs.
>
> Bug: 1105096
> Change-Id: I3f73acc277ebf7b40e9f93385a3a097b768662a1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310356
> Reviewed-by: John Chen <johnchen@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#790569}

TBR=johnchen@chromium.org

Bug: 1105096
Change-Id: I2a3089ec00ca5c20def79cc48bc087738c104462
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2312856Reviewed-by: default avatarClark DuVall <cduvall@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790837}
parent d8e77190
......@@ -23,22 +23,18 @@ group("telemetry_chrome_test") {
if (is_android) {
data_deps += [
":telemetry_weblayer_apks",
"//android_webview:system_webview_apk",
"//android_webview/test:webview_instrumentation_apk",
"//android_webview/tools/system_webview_shell:system_webview_shell_apk",
"//chrome/android:chrome_public_apk",
"//chrome/android:monochrome_public_apk",
"//chrome/android:monochrome_public_bundle",
"//chrome/android/webapk/shell_apk:maps_go_webapk",
]
if (enable_chrome_android_internal) {
data_deps += [ "//clank:telemetry_clank_test" ]
}
if (public_android_sdk) {
data_deps += [
"//android_webview:system_webview_apk",
"//android_webview/tools/system_webview_shell:system_webview_shell_apk",
"//chrome/android:monochrome_public_apk",
"//chrome/android:monochrome_public_bundle",
]
}
} else if (!is_fuchsia) {
data_deps += [ "//chrome" ]
}
......
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