Revert of Generate Android .isolate files used for test()s

build/config/android/internal_rules.gni

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 2077 matching lines @@
     forward_variables_from(invoker,
                            [
                              "data_deps",
                              "deps",
                            ])
 
     script = "//build/android/gyp/create_test_runner_script.py"
     depfile = "$target_gen_dir/$target_name.d"
 
     data_deps += [ "//build/android:test_runner_py" ]
-    data = []
 
     test_runner_args = [
       _test_type,
       "--output-directory",
       rebase_path(root_build_dir, root_build_dir),
     ]
 
     # apk_target is not used for native executable tests
     # (e.g. breakpad_unittests).
     if (defined(invoker.apk_target)) {
@@ skipping 64 matching lines @@
         _build_config = get_label_info(additional_apk, "target_gen_dir") + "/" +
                         get_label_info(additional_apk, "name") + ".build_config"
         _rebased_build_config = rebase_path(_build_config, root_build_dir)
         test_runner_args += [
           "--additional-apk",
           "@FileArg($_rebased_build_config:deps_info:apk_path)",
         ]
       }
     }
     if (defined(invoker.isolate_file)) {
-      data += [ invoker.isolate_file ]
       test_runner_args += [
         "--isolate-file-path",
         rebase_path(invoker.isolate_file, root_build_dir),
       ]
     }
     if (defined(invoker.shard_timeout)) {
       test_runner_args += [ "--shard-timeout=${invoker.shard_timeout}" ]
     }
     if (_incremental_install) {
       test_runner_args += [
@@ skipping 10 matching lines @@
     }
     if (is_asan) {
       test_runner_args += [ "--tool=asan" ]
     }
 
     generated_script = "$root_build_dir/bin/run_${_test_name}"
     outputs = [
       depfile,
       generated_script,
     ]
-    data += [ generated_script ]
+    data = [
+      generated_script,
+    ]
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }