Reland "Reland "Fully split Android/non-Android Telemetry targets""
This is a reland of 2b69aabf44e755c23f3d0e688c45a499068b144a
Changes from reverted CL: Perf tests are set to include all
binaries instead of trying to split them properly.
Original change's description:
> Reland "Fully split Android/non-Android Telemetry targets"
>
> This is a reland of 15e46773148f209b8936be6d8cfc0a7bdf8a61b8
>
> Changes from original CL:
> Special cased some perf testing targets to include additional
> browser binaries. This is necessary until GN targets and
> Telemetry browsers have a 1:1 relationship (crbug.com/1231290).
>
> Original change's description:
> > Fully split Android/non-Android Telemetry targets
> >
> > Fully splits the Android and non-Android Telemetry targets, meaning:
> >
> > 1. The Android binaries are fully removed from the non-Android targets
> > 2. The non-Android targets are gated behind !is_android checks
> >
> > This will allow us to get the actual benefit of splitting the targets,
> > which is fewer things to compile and a smaller isolate size when running
> > on swarming.
> >
> > Bug: 1203798
> > Change-Id: I9e0706c0ca9c53c6221cecab5413a7b1b4e1da82
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2950566
> > Reviewed-by: Takumi Fujimoto <[email protected]>
> > Reviewed-by: John Chen <[email protected]>
> > Reviewed-by: Scott Violet <[email protected]>
> > Commit-Queue: Brian Sheedy <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#902215}
>
> Bug: 1203798
> Change-Id: I4667677150be7f06bc4d9904d32c85a5b8cfe9c1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3042358
> Reviewed-by: John Chen <[email protected]>
> Reviewed-by: Scott Violet <[email protected]>
> Auto-Submit: Brian Sheedy <[email protected]>
> Commit-Queue: Scott Violet <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#919501}
Bug: 1203798
Change-Id: I60478ddb227f481483d4b2d5dd95087b9c267101
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3163568
Reviewed-by: John Chen <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Commit-Queue: Scott Violet <[email protected]>
Auto-Submit: Brian Sheedy <[email protected]>
Cr-Commit-Position: refs/heads/main@{#922738}
diff --git a/BUILD.gn b/BUILD.gn
index 54917b2a..eb0587f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -252,7 +252,6 @@
if (!is_ios && !is_fuchsia) {
deps += [
- "//chrome/test:telemetry_perf_unittests",
"//chrome/test:unit_tests",
"//components:components_browsertests",
"//device:device_unittests",
@@ -261,7 +260,9 @@
"//media/cast:cast_unittests",
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
]
- if (is_android) {
+ if (!is_android) {
+ deps += [ "//chrome/test:telemetry_perf_unittests" ]
+ } else {
import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
deps += [ "//chrome/test:telemetry_perf_unittests${_target_suffix}" ]
@@ -829,9 +830,10 @@
"//chrome/browser/vr:vr_common_perftests",
"//chrome/browser/vr:vr_common_unittests",
"//chrome/browser/vr:vr_pixeltests",
- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
]
- if (is_android) {
+ if (!is_android) {
+ deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ]
+ } else {
deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
