Revert of Make instrumentation test dependency on a support APK explicit

build/config/android/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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 1785 matching lines @@
 #     after the .apk is).
 #   deps: List of dependencies. All Android java resources and libraries in the
 #     "transitive closure" of these dependencies will be included in the apk.
 #     Note: this "transitive closure" actually only includes such targets if
 #     they are depended on through android_library or android_resources targets
 #     (and so not through builtin targets like 'action', 'group', etc).
 #   java_files: List of .java files to include in the apk.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #      will be added to java_files and be included in this apk.
 #   apk_name: Name for final apk.
-#   support_apk_path: Path to a support apk. If present, the test runner script
-#      will install it on the device before running the instrumentation tests.
-#      Should be a path relative to the src root.
 #   final_apk_path: Path to final built apk. Default is
 #     $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name.
 #   native_libs: List paths of native libraries to include in this apk. If these
 #     libraries depend on other shared_library targets, those dependencies will
 #     also be included in the apk.
 #   apk_under_test: The apk being tested.
 #   isolate_file: Isolate file containing the list of test data dependencies.
 #
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
 #     this directory will be included in the library. This is only supported to
@@ skipping 19 matching lines @@
 
   if (defined(invoker.apk_name)) {
     test_runner_data_dep = [ ":${_template_name}__test_runner_script" ]
     test_runner_script("${_template_name}__test_runner_script") {
       test_name = invoker.target_name
       test_type = "instrumentation"
       test_apk = invoker.apk_name
       if (defined(invoker.isolate_file)) {
         isolate_file = invoker.isolate_file
       }
-      if (defined(invoker.support_apk_path)) {
-        support_apk_path = invoker.support_apk_path
-      }
     }
   }
 
   android_apk(target_name) {
     if (defined(invoker.android_manifest)) {
       android_manifest = invoker.android_manifest
     }
     data_deps = [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
@@ skipping 356 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }