Commit c7539ef6 authored by John Budorick's avatar John Budorick Committed by Commit Bot

Revert "Build internal android targets in telemetry_chrome_test."

This reverts commit e0c7bc0e.

Reason for revert: crbug.com/903425

Original change's description:
> Build internal android targets in telemetry_chrome_test.
> 
> Requires crrev.com/i/709113
> 
> Bug: 817842
> Change-Id: If7556e8aa41631e12def309927656b4bcbcac330
> Reviewed-on: https://chromium-review.googlesource.com/c/1315992
> Reviewed-by: Juan Antonio Navarro Pérez <perezju@chromium.org>
> Reviewed-by: Ned Nguyen <nednguyen@google.com>
> Commit-Queue: John Budorick <jbudorick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#606139}

TBR=perezju@chromium.org,nednguyen@google.com,jbudorick@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 817842
Change-Id: I36d79be86060440535dd136e58427812d02db98d
Reviewed-on: https://chromium-review.googlesource.com/c/1330843Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607095}
parent 61fc2540
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
import("//build/config/compiler/compiler.gni") import("//build/config/compiler/compiler.gni")
if (is_android) { if (is_android) {
# Pull in enable_chrome_android_internal and public_android_sdk import("//build/config/android/config.gni") # For public_android_sdk
import("//build/config/android/config.gni")
} }
if (is_chromeos) { if (is_chromeos) {
import("//build/config/chromeos/rules.gni") import("//build/config/chromeos/rules.gni")
...@@ -20,18 +19,14 @@ group("telemetry_chrome_test") { ...@@ -20,18 +19,14 @@ group("telemetry_chrome_test") {
data = [] data = []
if (is_android) { if (is_android) {
if (enable_chrome_android_internal) { data_deps += [ "//chrome/android:chrome_public_apk" ]
data_deps += [ "//clank:telemetry_clank_test" ]
} else {
data_deps += [ "//chrome/android:chrome_public_apk" ]
if (public_android_sdk) { if (public_android_sdk) {
data_deps += [ data_deps += [
"//android_webview:system_webview_apk", "//android_webview:system_webview_apk",
"//android_webview/tools/system_webview_shell:system_webview_shell_apk", "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
"//chrome/android:monochrome_public_apk", "//chrome/android:monochrome_public_apk",
] ]
}
} }
} else { } else {
data_deps += [ "//chrome" ] data_deps += [ "//chrome" ]
...@@ -88,7 +83,9 @@ group("telemetry_chrome_test_without_chrome") { ...@@ -88,7 +83,9 @@ group("telemetry_chrome_test_without_chrome") {
"//third_party/catapult:telemetry_chrome_test_support", "//third_party/catapult:telemetry_chrome_test_support",
] ]
if (!is_android) { if (!is_android) {
data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ] data_deps += [
"//third_party/catapult/telemetry:bitmaptools",
]
} }
data = [ data = [
......
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