[Android] Move isolate generation into //build/config/android.

testing/test.gni

 # Copyright 2015 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.
 
 # ==============================================================================
 # TEST SETUP
 # ==============================================================================
 
-template("_gen_isolate") {
-  testonly = true
-  _runtime_deps_file = "$target_gen_dir/$target_name.runtime_deps"
-  group("${target_name}__write_deps") {
-    forward_variables_from(invoker,
-                           [
-                             "data",
-                             "data_deps",
-                             "deps",
-                             "public_deps",
-                           ])
-    write_runtime_deps = _runtime_deps_file
-  }
-
-  action(target_name) {
-    script = "//testing/generate_isolate.py"
-    inputs = [
-      _runtime_deps_file,
-    ]
-    outputs = [
-      invoker.output,
-    ]
-    args = [
-      "--output-directory=.",
-      "--out-file",
-      rebase_path(invoker.output, root_build_dir),
-      "--runtime-deps-file",
-      rebase_path(_runtime_deps_file, root_build_dir),
-    ]
-    if (is_android) {
-      args += [ "--apply-android-filters" ]
-    }
-    if (defined(invoker.apply_device_filters) && invoker.apply_device_filters) {
-      args += [ "--apply-device-filters" ]
-    }
-    _assert_no_odd_data =
-        defined(invoker.assert_no_odd_data) && invoker.assert_no_odd_data
-    if (_assert_no_odd_data) {
-      args += [ "--assert-no-odd-data" ]
-    }
-    if (defined(invoker.command)) {
-      _isolate_dir = get_path_info(invoker.output, "dir")
-      args += [
-        "--command",
-        rebase_path(invoker.command, _isolate_dir),
-      ]
-    }
-    deps = [
-      ":${invoker.target_name}__write_deps",
-    ]
-  }
-}
-
 # Define a test as an executable (or apk on Android) with the "testonly" flag
 # set.
 # Variable:
 #   use_raw_android_executable: Use executable() rather than android_apk().
 #   use_native_activity: Test implements ANativeActivity_onCreate().
 template("test") {
   if (is_android) {
     import("//build/config/android/config.gni")
     import("//build/config/android/rules.gni")
     import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 19 matching lines @@
 
     if (_generate_device_isolate) {
       _allow_odd_runtime_deps = defined(invoker.allow_odd_runtime_deps) &&
                                 invoker.allow_odd_runtime_deps
 
       # The device isolate is needed at runtime, so it cannot go in
       # target_gen_dir, as builder/tester configurations do not include it.
       _target_dir_name = get_label_info(":$target_name", "dir")
       _device_isolate_path = "$root_out_dir/gen.runtime/$_target_dir_name/$target_name.device.isolate"
       _gen_isolate_target_name = "${target_name}__isolate"
-      _gen_isolate(_gen_isolate_target_name) {
+      device_isolate(_gen_isolate_target_name) {
         forward_variables_from(invoker,
                                [
                                  "data",
                                  "data_deps",
                                  "deps",
                                  "public_deps",
                                ])
         assert_no_odd_data = !_allow_odd_runtime_deps
         output = _device_isolate_path
-        apply_device_filters = true
       }
     }
 
     assert(_use_raw_android_executable || enable_java_templates)
 
     if (_use_raw_android_executable) {
       _exec_target = "${target_name}__exec"
       _dist_target = "${target_name}__dist"
       _exec_output =
           "$target_out_dir/${invoker.target_name}/${invoker.target_name}"
@@ skipping 244 matching lines @@
 }
 
 # Test defaults.
 set_defaults("test") {
   if (is_android) {
     configs = default_shared_library_configs
   } else {
     configs = default_executable_configs
   }
 }