Add Android Telemetry split targets

Adds versions of all Telemetry-based tests that can run on Android that
only contain a single Chrome binary type (e.g. ChromePublic.apk) instead
of all types in a single target. This reduces the amount of data in the
swarming isolate by ~80%, which significantly cuts down on swarming
overhead.

The combined binaries are still available in the original targets, but
will be removed and the targets made exclusive to non-Android platforms
once all Android uses have been properly converted to the new targets.

Also switches over some, but not all, uses of the old targets to the
split versions.

Bug: 1203798
Change-Id: I2918c84ce5b945732a3249b0062e8baedd80055c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2928646
Reviewed-by: John Chen <johnchen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#889119}

BUILD.gn

@@ -257,6 +257,12 @@ group("gn_all") {
       "//media/cast:cast_unittests",
       "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
     ]
+    if (is_android) {
+      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}" ]
+      }
+    }
   } else if (is_ios) {
     deps += [
       "//ios:all",
@@ -823,6 +829,12 @@ group("gn_all") {
     ]
     if (is_android) {
       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) {
+        deps += [
+          "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}",
+        ]
+      }
     }
   }
 

chrome/test/BUILD.gn

@@ -593,6 +593,27 @@ group("telemetry_gpu_integration_test") {
   ]
 }
 
+if (is_android) {
+  template("telemetry_gpu_integration_test_android_template") {
+    forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+    group(target_name) {
+      testonly = true
+      data_deps = [
+        "//content/test:telemetry_gpu_integration_test_support",
+        "//tools/perf/chrome_telemetry_build:telemetry_chrome_test${telemetry_target_suffix}",
+      ]
+    }
+  }
+
+  import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+  foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+    telemetry_gpu_integration_test_android_template(
+        "telemetry_gpu_integration_test${_target_suffix}") {
+      telemetry_target_suffix = _target_suffix
+    }
+  }
+}
+
 if (is_win) {
   source_set("credential_provider_test_utils") {
     testonly = true
@@ -3902,10 +3923,8 @@ if (is_linux || is_chromeos || is_mac || is_win || is_android) {
   }
 }
 
-group("telemetry_perf_unittests") {
+group("telemetry_perf_unittests_base") {
   testonly = true
-  deps = [ "//tools/perf:perf" ]
-
   data = [
     # For isolate contract.
     "//testing/scripts/run_telemetry_as_googletest.py",
@@ -3924,16 +3943,72 @@ group("telemetry_perf_unittests") {
   data_deps = [ "//testing:test_scripts_shared" ]
 }
 
-group("telemetry_perf_tests") {
+group("telemetry_perf_unittests") {
   testonly = true
-  deps = [ "//tools/perf/:perf" ]
+  data_deps = [
+    ":telemetry_perf_unittests_base",
+    "//tools/perf:perf",
+  ]
+}
 
+if (is_android) {
+  template("telemetry_perf_unittests_android_template") {
+    forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+    group(target_name) {
+      testonly = true
+      data_deps = [
+        ":telemetry_perf_unittests_base",
+        "//tools/perf:perf${telemetry_target_suffix}",
+      ]
+    }
+  }
+
+  import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+  foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+    telemetry_perf_unittests_android_template(
+        "telemetry_perf_unittests${_target_suffix}") {
+      telemetry_target_suffix = _target_suffix
+    }
+  }
+}
+
+group("telemetry_perf_tests_base") {
+  testonly = true
   data_deps = [
     # Needed for isolate script to execute.
     "//testing:test_scripts_shared",
   ]
 }
 
+group("telemetry_perf_tests") {
+  testonly = true
+  data_deps = [
+    ":telemetry_perf_tests_base",
+    "//tools/perf/:perf",
+  ]
+}
+
+if (is_android) {
+  template("telemetry_perf_tests_android_template") {
+    forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+    group(target_name) {
+      testonly = true
+      data_deps = [
+        ":telemetry_perf_tests_base",
+        "//tools/perf/:perf${telemetry_target_suffix}",
+      ]
+    }
+  }
+
+  import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+  foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+    telemetry_perf_tests_android_template(
+        "telemetry_perf_tests${_target_suffix}") {
+      telemetry_target_suffix = _target_suffix
+    }
+  }
+}
+
 group("ct_telemetry_perf_tests_without_chrome") {
   testonly = true
   deps = [ "//tools/perf/:perf_without_chrome" ]
@@ -3953,8 +4028,12 @@ group("ct_telemetry_perf_tests_without_chrome") {
 
 # New target that will replace telemetry_perf_tests when testing
 # is done.
-template("performance_test_suite_template") {
-  forward_variables_from(invoker, [ "override_board" ])
+template("performance_test_suite_template_base") {
+  forward_variables_from(invoker,
+                         [
+                           "override_board",
+                           "data_deps",
+                         ])
   script_test(target_name) {
     run_under_python2 = true
     script = "//testing/scripts/run_performance_tests.py"
@@ -3968,9 +4047,8 @@ template("performance_test_suite_template") {
       args = [ "../../tools/perf/run_benchmark" ]
     }
 
-    data_deps = [
+    data_deps += [
       "//base:base_perftests",
-      "//chrome/test:telemetry_perf_tests",
       "//components:components_perftests",
       "//components/tracing:tracing_perftests",
       "//gpu:command_buffer_perftests",
@@ -4004,9 +4082,40 @@ template("performance_test_suite_template") {
   }
 }
 
+template("performance_test_suite_template") {
+  forward_variables_from(invoker, [ "override_board" ])
+  performance_test_suite_template_base(target_name) {
+    data_deps = [ "//chrome/test:telemetry_perf_tests" ]
+  }
+}
+
+if (is_android) {
+  template("performance_test_suite_template_android") {
+    forward_variables_from(invoker,
+                           [
+                             "override_board",
+                             "telemetry_target_suffix",
+                           ])
+    performance_test_suite_template_base(target_name) {
+      data_deps =
+          [ "//chrome/test:telemetry_perf_tests${telemetry_target_suffix}" ]
+    }
+  }
+}
+
 performance_test_suite_template("performance_test_suite") {
 }
 
+if (is_android) {
+  import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+  foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+    performance_test_suite_template_android(
+        "performance_test_suite${_target_suffix}") {
+      telemetry_target_suffix = _target_suffix
+    }
+  }
+}
+
 # Generate performance_test_suite_${board} targets.
 # These set --board to ${board} instead of deriving it from the target.
 # This is useful for Lacros, where the generic build is deployed to
@@ -4021,25 +4130,27 @@ if (is_chromeos_device && cros_boards != "") {
   }
 }
 
-# Difference between this and performance_test_suite is that this runs a devil
-# script before the build, to remove the system webview. See
-# //testing/buildbot/gn_isolate_map.pyl
-group("performance_webview_test_suite") {
-  testonly = true
-  deps = [ "//chrome/test:performance_test_suite" ]
-}
+if (is_android) {
+  # Difference between this and performance_test_suite is that this runs a devil
+  # script before the build, to remove the system webview. See
+  # //testing/buildbot/gn_isolate_map.pyl
+  group("performance_webview_test_suite") {
+    testonly = true
+    deps = [ "//chrome/test:performance_test_suite_android_webview" ]
+  }
 
-group("performance_weblayer_test_suite") {
-  testonly = true
-  deps = [ "//chrome/test:performance_test_suite" ]
-}
+  group("performance_weblayer_test_suite") {
+    testonly = true
+    deps = [ "//chrome/test:performance_test_suite_android_weblayer" ]
+  }
 
-# Difference between this and telemetry_perf_tests is that this runs a devil
-# script before the build, to remove the system webview. See
-# //testing/buildbot/gn_isolate_map.pyl
-group("telemetry_perf_webview_tests") {
-  testonly = true
-  deps = [ "//chrome/test:telemetry_perf_tests" ]
+  # Difference between this and telemetry_perf_tests is that this runs a devil
+  # script before the build, to remove the system webview. See
+  # //testing/buildbot/gn_isolate_map.pyl
+  group("telemetry_perf_webview_tests") {
+    testonly = true
+    deps = [ "//chrome/test:telemetry_perf_tests_android_webview" ]
+  }
 }
 
 config("disable_thinlto_cache_flags") {
@@ -8473,9 +8584,8 @@ if (is_chromeos_ash) {
 }
 
 if (is_mac || is_win || is_android) {
-  group("rendering_representative_perf_tests") {
+  group("rendering_representative_perf_tests_base") {
     testonly = true
-    deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
     data = [
       "//build/android/pylib",
       "//chrome/test/data/perf",
@@ -8486,6 +8596,35 @@ if (is_mac || is_win || is_android) {
     ]
     data_deps = [ "//testing:test_scripts_shared" ]
   }
+
+  group("rendering_representative_perf_tests") {
+    testonly = true
+    data_deps = [
+      ":rendering_representative_perf_tests_base",
+      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
+    ]
+  }
+
+  if (is_android) {
+    template("rendering_representative_perf_tests_android_template") {
+      forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+      group(target_name) {
+        testonly = true
+        data_deps = [
+          ":rendering_representative_perf_tests_base",
+          "//tools/perf/chrome_telemetry_build:telemetry_chrome_test${telemetry_target_suffix}",
+        ]
+      }
+    }
+
+    import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+    foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+      rendering_representative_perf_tests_android_template(
+          "rendering_representative_perf_tests${_target_suffix}") {
+        telemetry_target_suffix = _target_suffix
+      }
+    }
+  }
 }
 
 if (is_win) {

chrome/test/media_router/BUILD.gn

@@ -144,14 +144,42 @@ source_set("test_support") {
 }
 
 if (enable_downstream_media_tests) {
-  group("media_router_perf_tests") {
+  group("media_router_perf_tests_base") {
     testonly = true
     data = [
       "$root_out_dir/mr_extension/",
       "internal/",
       "telemetry/",
     ]
-    deps = [ "//tools/perf:perf" ]
     data_deps = [ "//tools/perf/contrib/media_router_benchmarks:telemetry_extension_resources" ]
   }
+
+  group("media_router_perf_tests") {
+    testonly = true
+    data_deps = [
+      ":media_router_perf_tests_base",
+      "//tools/perf:perf",
+    ]
+  }
+
+  if (is_android) {
+    template("media_router_perf_tests_android_template") {
+      forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+      group(target_name) {
+        testonly = true
+        data_deps = [
+          ":media_router_perf_tests_base",
+          "//tools/perf:perf${telemetry_target_suffix}",
+        ]
+      }
+    }
+
+    import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+    foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+      media_router_perf_tests_android_template(
+          "media_router_perf_tests${_target_suffix}") {
+        telemetry_target_suffix = _target_suffix
+      }
+    }
+  }
 }

testing/buildbot/chromium.android.json

@@ -30898,7 +30898,7 @@
           "--passthrough",
           "--retry-limit=2"
         ],
-        "isolate_name": "telemetry_perf_unittests",
+        "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -30927,7 +30927,7 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests_android_chrome/"
       }
     ],
     "junit_tests": [
@@ -35612,7 +35612,7 @@
           "--passthrough",
           "--retry-limit=2"
         ],
-        "isolate_name": "telemetry_perf_unittests",
+        "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -35641,7 +35641,7 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests_android_chrome/"
       },
       {
         "args": [
@@ -35651,7 +35651,7 @@
           "--passthrough",
           "--retry-limit=2"
         ],
-        "isolate_name": "telemetry_perf_unittests",
+        "isolate_name": "telemetry_perf_unittests_android_monochrome",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -35680,13 +35680,13 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests_android_monochrome/"
       },
       {
         "args": [
           "--extra-browser-args=--enable-crashpad"
         ],
-        "isolate_name": "telemetry_perf_unittests",
+        "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -35717,7 +35717,7 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 12
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests_android_chrome/"
       }
     ],
     "junit_tests": [
@@ -44301,7 +44301,7 @@
           "--passthrough",
           "--retry-limit=2"
         ],
-        "isolate_name": "telemetry_perf_unittests",
+        "isolate_name": "telemetry_perf_unittests_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -44329,7 +44329,7 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests_android_chrome/"
       },
       {
         "args": [
@@ -44339,7 +44339,7 @@
           "--passthrough",
           "--retry-limit=2"
         ],
-        "isolate_name": "telemetry_perf_unittests",
+        "isolate_name": "telemetry_perf_unittests_android_monochrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -44367,7 +44367,7 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests_android_monochrome/"
       }
     ]
   },

testing/buildbot/chromium.angle.json

@@ -257,7 +257,7 @@
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gles --use-cmd-decoder=passthrough --force_high_performance_gpu",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -289,7 +289,7 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       }
     ]
   },

testing/buildbot/chromium.gpu.json

@@ -12,7 +12,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=validating"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -43,7 +43,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -54,7 +54,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -85,7 +85,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -96,7 +96,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -127,7 +127,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -138,7 +138,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -169,7 +169,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -184,7 +184,7 @@
           "--expected-device-id",
           "0"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -215,7 +215,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -230,7 +230,7 @@
           "${buildername}",
           "--git-revision=${got_revision}"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -266,7 +266,7 @@
           "idempotent": false,
           "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -281,7 +281,7 @@
           "${buildername}",
           "--git-revision=${got_revision}"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -317,7 +317,7 @@
           "idempotent": false,
           "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -326,7 +326,7 @@
           "--browser=android-chromium"
         ],
         "experiment_percentage": 10,
-        "isolate_name": "rendering_representative_perf_tests",
+        "isolate_name": "rendering_representative_perf_tests_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -352,7 +352,7 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:rendering_representative_perf_tests/"
+        "test_id_prefix": "ninja://chrome/test:rendering_representative_perf_tests_android_chrome/"
       },
       {
         "args": [
@@ -364,7 +364,7 @@
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=validating --force-online-connection-state-for-indicator",
           "--dont-restore-color-profile-after-test"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -395,7 +395,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -406,7 +406,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -437,7 +437,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -449,7 +449,7 @@
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -481,7 +481,7 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 12
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       }
     ]
   },

testing/buildbot/client.v8.fyi.json

@@ -12,7 +12,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=validating"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -42,7 +42,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -53,7 +53,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -83,7 +83,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -94,7 +94,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -124,7 +124,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -135,7 +135,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -165,7 +165,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -180,7 +180,7 @@
           "${buildername}",
           "--git-revision=${got_cr_revision}"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -215,7 +215,7 @@
           "idempotent": false,
           "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -230,7 +230,7 @@
           "${buildername}",
           "--git-revision=${got_cr_revision}"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -265,7 +265,7 @@
           "idempotent": false,
           "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -277,7 +277,7 @@
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=validating --force-online-connection-state-for-indicator",
           "--dont-restore-color-profile-after-test"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -307,7 +307,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -318,7 +318,7 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -348,7 +348,7 @@
           "idempotent": false,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -360,7 +360,7 @@
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gles --use-cmd-decoder=passthrough --force_high_performance_gpu",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -391,7 +391,7 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       },
       {
         "args": [
@@ -403,7 +403,7 @@
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=validating --force_high_performance_gpu",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
         ],
-        "isolate_name": "telemetry_gpu_integration_test",
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -434,7 +434,7 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
           "shards": 6
         },
-        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
       }
     ]
   },

testing/buildbot/generate_buildbot_json.py

@@ -26,6 +26,13 @@ import buildbot_json_magic_substitutions as magic_substitutions
 
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 
+BROWSER_CONFIG_TO_TARGET_SUFFIX_MAP = {
+    'android-chromium': '_android_chrome',
+    'android-chromium-monochrome': '_android_monochrome',
+    'android-weblayer': '_android_weblayer',
+    'android-webview': '_android_webview',
+}
+
 
 class BBGenErr(Exception):
   def __init__(self, message):
@@ -921,12 +928,11 @@ class BBJSONGenerator(object):
     if not result:
       return None
     result['isolate_name'] = test_config.get(
-      'isolate_name', 'telemetry_gpu_integration_test')
+        'isolate_name',
+        self.get_default_isolate_name(tester_config, is_android_webview))
 
     # Populate test_id_prefix.
-    gn_entry = (
-        self.gn_isolate_map.get(result['isolate_name']) or
-        self.gn_isolate_map.get('telemetry_gpu_integration_test'))
+    gn_entry = self.gn_isolate_map[result['isolate_name']]
     result['test_id_prefix'] = 'ninja:%s/' % gn_entry['label']
 
     args = result.get('args', [])
@@ -969,6 +975,16 @@ class BBJSONGenerator(object):
       tester_config, result['swarming'], args))
     return result
 
+  def get_default_isolate_name(self, tester_config, is_android_webview):
+    if self.is_android(tester_config):
+      if is_android_webview:
+        return 'telemetry_gpu_integration_test_android_webview'
+      return (
+          'telemetry_gpu_integration_test' +
+          BROWSER_CONFIG_TO_TARGET_SUFFIX_MAP[tester_config['browser_config']])
+    else:
+      return 'telemetry_gpu_integration_test'
+
   def get_test_generator_map(self):
     return {
         'android_webview_gpu_telemetry_tests':

testing/buildbot/generate_buildbot_json_unittest.py

@@ -355,6 +355,58 @@ FOO_GPU_TELEMETRY_TEST_WATERFALL = """\
 ]
 """
 
+FOO_GPU_TELEMETRY_TEST_WATERFALL_ANDROID = """\
+[
+  {
+    'project': 'chromium',
+    'bucket': 'ci',
+    'name': 'chromium.test',
+    'machines': {
+      'Fake Tester': {
+        'os_type': 'android',
+        'browser_config': 'android-chromium',
+        'swarming': {
+          'dimension_sets': [
+            {
+              'device_type': 'bullhead',
+            },
+          ],
+        },
+        'test_suites': {
+          'gpu_telemetry_tests': 'composition_tests',
+        },
+      },
+    },
+  },
+]
+"""
+
+FOO_GPU_TELEMETRY_TEST_WATERFALL_ANDROID_WEBVIEW = """\
+[
+  {
+    'project': 'chromium',
+    'bucket': 'ci',
+    'name': 'chromium.test',
+    'machines': {
+      'Fake Tester': {
+        'os_type': 'android',
+        'browser_config': 'not-a-real-browser',
+        'swarming': {
+          'dimension_sets': [
+            {
+              'device_type': 'bullhead',
+            },
+          ],
+        },
+        'test_suites': {
+          'android_webview_gpu_telemetry_tests': 'composition_tests',
+        },
+      },
+    },
+  },
+]
+"""
+
 NVIDIA_GPU_TELEMETRY_TEST_WATERFALL = """\
 [
   {
@@ -1554,6 +1606,96 @@ GPU_TELEMETRY_TEST_OUTPUT = """\
 }
 """
 
+GPU_TELEMETRY_TEST_OUTPUT_ANDROID = """\
+{
+  "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+  "AAAAA2 See generate_buildbot_json.py to make changes": {},
+  "Fake Tester": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "foo",
+          "--show-stdout",
+          "--browser=android-chromium",
+          "--passthrough",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "foo_tests",
+        "should_retry_with_patch": false,
+        "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_type": "bullhead"
+            }
+          ],
+          "idempotent": false
+        },
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+      }
+    ]
+  }
+}
+"""
+
+GPU_TELEMETRY_TEST_OUTPUT_ANDROID_WEBVIEW = """\
+{
+  "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+  "AAAAA2 See generate_buildbot_json.py to make changes": {},
+  "Fake Tester": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "foo",
+          "--show-stdout",
+          "--browser=android-webview-instrumentation",
+          "--passthrough",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test_android_webview",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "foo_tests",
+        "should_retry_with_patch": false,
+        "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_type": "bullhead"
+            }
+          ],
+          "idempotent": false
+        },
+        "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_webview/"
+      }
+    ]
+  }
+}
+"""
+
 NVIDIA_GPU_TELEMETRY_TEST_OUTPUT = """\
 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
@@ -2146,6 +2288,25 @@ GPU_TELEMETRY_GN_ISOLATE_MAP="""\
       }
 }
 """
+
+GPU_TELEMETRY_GN_ISOLATE_MAP_ANDROID = """\
+{
+  'telemetry_gpu_integration_test_android_chrome': {
+    'label': '//chrome/test:telemetry_gpu_integration_test_android_chrome',
+    'type': 'script',
+      }
+}
+"""
+
+GPU_TELEMETRY_GN_ISOLATE_MAP_ANDROID_WEBVIEW = """\
+{
+  'telemetry_gpu_integration_test_android_webview': {
+    'label': '//chrome/test:telemetry_gpu_integration_test_android_webview',
+    'type': 'script',
+      }
+}
+"""
+
 GN_ISOLATE_MAP_KEY_LABEL_MISMATCH="""\
 {
   'foo_test': {
@@ -2476,6 +2637,34 @@ class UnitTest(TestCase):
     fbb.check_output_file_consistency(verbose=True)
     self.assertFalse(fbb.printed_lines)
 
+  def test_gpu_telemetry_tests_android(self):
+    fbb = FakeBBGen(self.args,
+                    FOO_GPU_TELEMETRY_TEST_WATERFALL_ANDROID,
+                    COMPOSITION_SUITE_WITH_NAME_NOT_ENDING_IN_TEST,
+                    LUCI_MILO_CFG,
+                    exceptions=NO_BAR_TEST_EXCEPTIONS,
+                    gn_isolate_map=GPU_TELEMETRY_GN_ISOLATE_MAP_ANDROID)
+    self.create_testing_buildbot_json_file('chromium.test.json',
+                                           GPU_TELEMETRY_TEST_OUTPUT_ANDROID)
+    self.create_testing_buildbot_json_file('chromium.ci.json',
+                                           GPU_TELEMETRY_TEST_OUTPUT_ANDROID)
+    fbb.check_output_file_consistency(verbose=True)
+    self.assertFalse(fbb.printed_lines)
+
+  def test_gpu_telemetry_tests_android_webview(self):
+    fbb = FakeBBGen(self.args,
+                    FOO_GPU_TELEMETRY_TEST_WATERFALL_ANDROID_WEBVIEW,
+                    COMPOSITION_SUITE_WITH_NAME_NOT_ENDING_IN_TEST,
+                    LUCI_MILO_CFG,
+                    exceptions=NO_BAR_TEST_EXCEPTIONS,
+                    gn_isolate_map=GPU_TELEMETRY_GN_ISOLATE_MAP_ANDROID_WEBVIEW)
+    self.create_testing_buildbot_json_file(
+        'chromium.test.json', GPU_TELEMETRY_TEST_OUTPUT_ANDROID_WEBVIEW)
+    self.create_testing_buildbot_json_file(
+        'chromium.ci.json', GPU_TELEMETRY_TEST_OUTPUT_ANDROID_WEBVIEW)
+    fbb.check_output_file_consistency(verbose=True)
+    self.assertFalse(fbb.printed_lines)
+
   def test_nvidia_gpu_telemetry_tests(self):
     fbb = FakeBBGen(self.args,
                     NVIDIA_GPU_TELEMETRY_TEST_WATERFALL,

testing/buildbot/gn_isolate_map.pyl

@@ -1541,6 +1541,16 @@
     "script": "//testing/scripts/run_rendering_benchmark_with_gated_performance.py",
     "type": "script",
   },
+  "rendering_representative_perf_tests_android_chrome": {
+    "args": [
+      "--output-format=csv",
+      "--browser=release",
+      "--upload-results",
+    ],
+    "label": "//chrome/test:rendering_representative_perf_tests_android_chrome",
+    "script": "//testing/scripts/run_rendering_benchmark_with_gated_performance.py",
+    "type": "script",
+  },
   "resource_sizes_chrome_modern_public_minimal_apks": {
     "label": "//chrome/android:resource_sizes_chrome_modern_public_minimal_apks",
     "type": "generated_script",
@@ -1678,6 +1688,22 @@
     "script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
     "type": "script",
   },
+  "telemetry_gpu_integration_test_android_chrome": {
+    "args": [
+      "../../content/test/gpu/run_gpu_integration_test.py",
+    ],
+    "label": "//chrome/test:telemetry_gpu_integration_test_android_chrome",
+    "script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
+    "type": "script",
+  },
+  "telemetry_gpu_integration_test_android_webview": {
+    "args": [
+      "../../content/test/gpu/run_gpu_integration_test.py",
+    ],
+    "label": "//chrome/test:telemetry_gpu_integration_test_android_webview",
+    "script": "//testing/scripts/run_gpu_integration_test_as_googletest.py",
+    "type": "script",
+  },
   "telemetry_gpu_integration_test_scripts_only": {
     "label": "//chrome/test:telemetry_gpu_integration_test_scripts_only",
     "type": "additional_compile_target",
@@ -1710,6 +1736,24 @@
     "script": "//testing/scripts/run_telemetry_as_googletest.py",
     "type": "script",
   },
+  "telemetry_perf_unittests_android_chrome": {
+    "args": [
+      "../../tools/perf/run_tests",
+      "-v",
+    ],
+    "label": "//chrome/test:telemetry_perf_unittests_android_chrome",
+    "script": "//testing/scripts/run_telemetry_as_googletest.py",
+    "type": "script",
+  },
+  "telemetry_perf_unittests_android_monochrome": {
+    "args": [
+      "../../tools/perf/run_tests",
+      "-v",
+    ],
+    "label": "//chrome/test:telemetry_perf_unittests_android_monochrome",
+    "script": "//testing/scripts/run_telemetry_as_googletest.py",
+    "type": "script",
+  },
   "telemetry_unittests": {
     "args": [
       "--xvfb",

testing/buildbot/test_suites.pyl

@@ -4752,7 +4752,7 @@
 
     'rendering_mobile_representative_perf_tests_isolated_scripts': {
       'rendering_representative_perf_tests': {
-        'isolate_name': 'rendering_representative_perf_tests',
+        'isolate_name': 'rendering_representative_perf_tests_android_chrome',
         'args': [
           "../../tools/perf/run_benchmark",
           "--benchmarks=rendering.mobile",
@@ -4764,7 +4764,7 @@
 
     'rendering_mobile_representative_perf_tests_isolated_scripts_experimental': {
       'rendering_representative_perf_tests': {
-        'isolate_name': 'rendering_representative_perf_tests',
+        'isolate_name': 'rendering_representative_perf_tests_android_chrome',
         'args': [
           "../../tools/perf/run_benchmark",
           "--benchmarks=rendering.mobile",
@@ -5044,7 +5044,7 @@
           '--passthrough',
           '--retry-limit=2',
         ],
-        'isolate_name': 'telemetry_perf_unittests',
+        'isolate_name': 'telemetry_perf_unittests_android_chrome',
         'resultdb': {
           'enable': True,
         },
@@ -5057,7 +5057,7 @@
           '--passthrough',
           '--retry-limit=2',
         ],
-        'isolate_name': 'telemetry_perf_unittests',
+        'isolate_name': 'telemetry_perf_unittests_android_monochrome',
         'resultdb': {
           'enable': True,
         },
@@ -5096,6 +5096,23 @@
       },
     },
 
+    'telemetry_perf_unittests_isolated_scripts_android': {
+      'telemetry_perf_unittests': {
+        'isolate_name': 'telemetry_perf_unittests_android_chrome',
+        'args': [
+          # TODO(crbug.com/1077284): Remove this once Crashpad is the default.
+          '--extra-browser-args=--enable-crashpad',
+        ],
+        'swarming': {
+          'idempotent': False,  # https://crbug.com/549140
+          'shards': 12,
+        },
+        'resultdb': {
+          'enable': True,
+        },
+      },
+    },
+
     'test_buildbucket_api_gpu_use_cases': {
       'test_buildbucket_api_gpu_use_cases': {},
     },
@@ -6750,14 +6767,14 @@
       'components_perftests_isolated_scripts',
       'monochrome_public_apk_checker_isolated_script',
       'telemetry_android_minidump_unittests_isolated_scripts',
-      'telemetry_perf_unittests_isolated_scripts',
+      'telemetry_perf_unittests_isolated_scripts_android',
     ],
 
     'marshmallow_pie_isolated_scripts': [
       'android_isolated_scripts',
       'components_perftests_isolated_scripts',
       'telemetry_android_minidump_unittests_isolated_scripts',
-      'telemetry_perf_unittests_isolated_scripts',
+      'telemetry_perf_unittests_isolated_scripts_android',
     ],
 
     'mojo_android_gtests': [

tools/perf/BUILD.gn

@@ -2,38 +2,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Keep in sync with group("perf_without_chrome").
 group("perf") {
   testonly = true
-  deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
-  data = [
-    "//tools/perf/",
-
-    # Field trial config
-    "//tools/variations/",
-    "//testing/variations/",
-
-    # Field trial dependencies
-    "//tools/json_comment_eater/",
-    "//tools/json_to_struct/",
-    "//components/variations/service/generate_ui_string_overrider.py",
-
-    # For blink_perf benchmarks.
-    "//third_party/blink/perf_tests/",
-
-    # For smoothness.tough_canvas_cases
-    "//chrome/test/data/perf/",
-
-    # For image_decoding.measurement
-    "//chrome/test/data/image_decoding/",
-
-    # For Pylib used by VR tests
-    "//build/android/pylib/",
+  data_deps = [
+    ":perf_without_chrome",
+    "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
   ]
+}
 
-  # Runs a script which generates the ad tagging ruleset.
-  if (!is_ios) {
-    data_deps = [ "//components/subresource_filter/tools:index_ruleset" ]
+if (is_android) {
+  template("perf_android_template") {
+    forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+    group(target_name) {
+      testonly = true
+      data_deps = [
+        ":perf_without_chrome",
+        "//tools/perf/chrome_telemetry_build:telemetry_chrome_test${telemetry_target_suffix}",
+      ]
+    }
+  }
+
+  import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+  foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+    perf_android_template("perf${_target_suffix}") {
+      telemetry_target_suffix = _target_suffix
+    }
   }
 }
 
@@ -50,11 +43,10 @@ if (is_android) {
   }
 }
 
-# Group for running benchmarks without building Chrome. Keep in sync with
-# group("perf").
+# Group for running benchmarks without building Chrome.
 group("perf_without_chrome") {
   testonly = true
-  deps = [
+  data_deps = [
     "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
   ]
 
@@ -83,15 +75,10 @@ group("perf_without_chrome") {
     "//build/android/pylib/",
   ]
 
-  data_deps = []
-
   # Runs a script which generates the ad tagging ruleset.
   if (!is_ios) {
     data_deps += [ "//components/subresource_filter/tools:index_ruleset" ]
   }
-  if (is_android) {
-    data_deps += [ "//chrome/android/webapk/shell_apk:maps_go_webapk" ]
-  }
 }
 
 # This group makes visible those targets in subdirectories that are not

tools/perf/chrome_telemetry_build/BUILD.gn

@@ -37,6 +37,9 @@ group("telemetry_chrome_test") {
   data = []
 
   if (is_android) {
+    # TODO(crbug.com/1213269): Remove these APK dependencies and fully switch to
+    # the separate Android targets below once all Android uses of the old target
+    # have been cleaned up.
     data_deps += [
       ":telemetry_weblayer_apks",
       "//android_webview:system_webview_apk",
@@ -100,6 +103,52 @@ group("telemetry_chrome_test") {
   }
 }
 
+# These telemetry_chrome_test_* targets exist to reduce the amount of data
+# included in swarming isolates. Including a bunch of different versions of
+# Chrome and their unstripped .so files that aren't actually used adds gigabytes
+# of data to the isolate, which in turn adds a non-trivial amount of swarming
+# overhead. A new one should be added each time a new type of APK is supported
+# and its suffix added to android_browser_types.gni.
+if (is_android) {
+  group("telemetry_chrome_test_android_chrome") {
+    testonly = true
+
+    data_deps = [
+      ":telemetry_chrome_test",
+      "//chrome/android:chrome_public_apk",
+    ]
+  }
+
+  group("telemetry_chrome_test_android_monochrome") {
+    testonly = true
+
+    data_deps = [
+      ":telemetry_chrome_test",
+      "//chrome/android:monochrome_public_apk",
+    ]
+  }
+
+  group("telemetry_chrome_test_android_weblayer") {
+    testonly = true
+
+    data_deps = [
+      ":telemetry_chrome_test",
+      ":telemetry_weblayer_apks",
+    ]
+  }
+
+  group("telemetry_chrome_test_android_webview") {
+    testonly = true
+
+    data_deps = [
+      ":telemetry_chrome_test",
+      "//android_webview:system_webview_apk",
+      "//android_webview/test:webview_instrumentation_apk",
+      "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
+    ]
+  }
+}
+
 group("telemetry_weblayer_apks") {
   testonly = true
 

tools/perf/chrome_telemetry_build/android_browser_types.gni

@@ -0,0 +1,10 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+telemetry_android_browser_target_suffixes = [
+  "_android_chrome",
+  "_android_monochrome",
+  "_android_weblayer",
+  "_android_webview",
+]

tools/perf/contrib/vr_benchmarks/BUILD.gn

@@ -5,7 +5,7 @@
 import("//chrome/browser/vr/features.gni")
 import("//device/vr/buildflags/buildflags.gni")
 
-group("vr_perf_tests") {
+group("vr_perf_tests_base") {
   testonly = true
   data = [
     "./data/",
@@ -26,8 +26,6 @@ group("vr_perf_tests") {
   ]
   data_deps = [ "//testing:run_perf_test" ]
 
-  deps = [ "//tools/perf:perf" ]
-
   if (is_android) {
     data += [
       "//chrome/android/shared_preference_files/test/",
@@ -47,7 +45,35 @@ group("vr_perf_tests") {
 
   if (is_win) {
     if (enable_openxr) {
-      deps += [ "//device/vr:openxr_mock" ]
+      data_deps += [ "//device/vr:openxr_mock" ]
+    }
+  }
+}
+
+group("vr_perf_tests") {
+  testonly = true
+  data_deps = [
+    ":vr_perf_tests_base",
+    "//tools/perf:perf",
+  ]
+}
+
+if (is_android) {
+  template("vr_perf_tests_android_template") {
+    forward_variables_from(invoker, [ "telemetry_target_suffix" ])
+    group(target_name) {
+      testonly = true
+      data_deps = [
+        ":vr_perf_tests_base",
+        "//tools/perf:perf${telemetry_target_suffix}",
+      ]
+    }
+  }
+
+  import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+  foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+    vr_perf_tests_android_template("vr_perf_tests${_target_suffix}") {
+      telemetry_target_suffix = _target_suffix
     }
   }
 }