Android Add _incremental targets for instrumentation tests

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
 # ==============================================================================
 
 # Define a test as an executable (or apk on Android) with the "testonly" flag
 # set.
@@ skipping 67 matching lines @@
       }
       deps += [ ":$library_name" ]
     }
 
     _test_name = main_target_name
     if (defined(invoker.output_name)) {
       _test_name = invoker.output_name
     }
     test_runner_script_name = "${_test_name}__test_runner_script"
     test_runner_script(test_runner_script_name) {
+      apk_target = ":$apk_name"
       test_name = _test_name
       test_type = "gtest"
       test_suite = _test_name
       if (defined(invoker.isolate_file)) {
         isolate_file = invoker.isolate_file
       }
     }
     incremental_test_runner_script_name =
         "${_test_name}_incremental__test_runner_script"
     test_runner_script(incremental_test_runner_script_name) {
+      apk_target = ":$apk_name"
       test_name = "${_test_name}_incremental"
       test_type = "gtest"
       test_suite = _test_name
       incremental_install = true
       if (defined(invoker.isolate_file)) {
         isolate_file = invoker.isolate_file
       }
     }
 
     group(target_name) {
@@ skipping 101 matching lines @@
     # TODO(GYP): Delete this after we've converted everything to GN.
     # The _run targets exist only for compatibility with GYP.
     group("${target_name}_run") {
       testonly = true
       deps = [
         ":$main_target_name",
       ]
     }
   }
 }