Android Add _incremental targets for instrumentation tests

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 511 matching lines @@
       if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
         args += [
           "--proguard-enabled",
           "--proguard-info",
           rebase_path(invoker.proguard_info, root_build_dir),
         ]
       }
 
       if (defined(invoker.apk_path)) {
         _rebased_apk_path = rebase_path(invoker.apk_path, root_build_dir)
+        _rebased_incremental_apk_path =
+            rebase_path(invoker.incremental_apk_path, root_build_dir)
+        _rebased_incremental_install_script_path =
+            rebase_path(invoker.incremental_install_script_path, root_build_dir)
         args += [ "--apk-path=$_rebased_apk_path" ]
+        args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ]
+        args += [ "--incremental-install-script-path=$_rebased_incremental_install_script_path" ]
       }
     }
 
     if (defined(invoker.srcjar)) {
       args += [
         "--srcjar",
         rebase_path(invoker.srcjar, root_build_dir),
       ]
     }
   }
@@ skipping 1477 matching lines @@
     ]
   }
 }
 
 # Generates a script in the output bin directory which runs the test
 # target using the test runner script in build/android/test_runner.py.
 template("test_runner_script") {
   testonly = true
   _test_name = invoker.test_name
   _test_type = invoker.test_type
+  _incremental_install =
+      defined(invoker.incremental_install) && invoker.incremental_install
 
   action(target_name) {
     script = "//build/android/gyp/create_test_runner_script.py"
     depfile = "$target_gen_dir/$target_name.d"
+    deps = []
 
     datadeps = [
       "//build/android:test_runner_py",
     ]
 
+    # apk_target is not used for native executable tests
+    # (e.g. breakpad_unittests).
+    if (defined(invoker.apk_target)) {
+      deps += [ "${invoker.apk_target}__build_config" ]
+      _apk_build_config =
+          get_label_info(invoker.apk_target, "target_gen_dir") + "/" +
+          get_label_info(invoker.apk_target, "name") + ".build_config"
+      _rebased_apk_build_config = rebase_path(_apk_build_config, root_build_dir)
+      assert(_rebased_apk_build_config != "")  # Mark as used.
+    }
+
     test_runner_args = [
       _test_type,
       "--output-directory",
       rebase_path(root_build_dir, root_build_dir),
     ]
     if (_test_type == "gtest") {
       assert(defined(invoker.test_suite))
       test_runner_args += [
         "--suite",
         invoker.test_suite,
       ]
     } else if (_test_type == "instrumentation") {
-      deps = [
-        "${invoker.apk_target}__build_config",
-      ]
-      _build_config =
-          get_label_info(invoker.apk_target, "target_gen_dir") + "/" +
-          get_label_info(invoker.apk_target, "name") + ".build_config"
-      _rebased_build_config = rebase_path(_build_config, root_build_dir)
-      test_runner_args += [
-        "--test-apk",
-        "@FileArg($_rebased_build_config:deps_info:apk_path)",
-        "--apk-under-test",
-        "@FileArg($_rebased_build_config:deps_info:tested_apk_path)",
-      ]
+      _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:apk_path)"
+      if (_incremental_install) {
+        _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:incremental_apk_path)"
+      }
+      test_runner_args += [ "--test-apk=$_test_apk" ]
+      if (defined(invoker.apk_under_test)) {
+        deps += [ "${invoker.apk_under_test}__build_config" ]
+        _apk_under_test_build_config =
+            get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
+            get_label_info(invoker.apk_under_test, "name") + ".build_config"
+        _rebased_apk_under_test_build_config =
+            rebase_path(_apk_under_test_build_config, root_build_dir)
+        _apk_under_test =
+            "@FileArg($_rebased_apk_under_test_build_config:deps_info:apk_path)"
+        if (_incremental_install) {
+          _apk_under_test = "@FileArg($_rebased_apk_under_test_build_config:deps_info:incremental_apk_path)"
+        }
+        test_runner_args += [ "--apk-under-test=$_apk_under_test" ]
+      }
       if (emma_coverage) {
         # Set a default coverage output directory (can be overridden by user
         # passing the same flag).
         test_runner_args += [
           "--coverage-dir",
           rebase_path("$root_out_dir/coverage", root_build_dir),
         ]
       }
     } else {
       assert(false, "Invalid test type: $_test_type.")
@@ skipping 10 matching lines @@
           "@FileArg($_rebased_build_config:deps_info:apk_path)",
         ]
       }
     }
     if (defined(invoker.isolate_file)) {
       test_runner_args += [
         "--isolate-file-path",
         rebase_path(invoker.isolate_file, root_build_dir),
       ]
     }
-    if (defined(invoker.incremental_install) && invoker.incremental_install) {
+    if (_incremental_install) {
       test_runner_args += [
-        "--incremental-install",
-        "--fast-local-dev",
+        "--test-apk-incremental-install-script",
+        "@FileArg($_rebased_apk_build_config:deps_info:incremental_install_script_path)",
       ]
+      if (defined(invoker.apk_under_test)) {
+        test_runner_args += [
+          "--apk-under-test-incremental-install-script",
+          "@FileArg($_rebased_apk_under_test_build_config:deps_info:incremental_install_script_path)",
+        ]
+      }
+      test_runner_args += [ "--fast-local-dev" ]
     }
     if (is_asan) {
       test_runner_args += [ "--tool=asan" ]
     }
 
     generated_script = "$root_build_dir/bin/run_${_test_name}"
     outputs = [
       depfile,
       generated_script,
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }