Add incremental_apk_by_default GN arg.

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 17 matching lines @@
     }
 
     _test_runner_target = "${_output_name}__test_runner_script"
     _wrapper_script_vars = [
       "ignore_all_data_deps",
       "shard_timeout",
     ]
 
     assert(_use_raw_android_executable || enable_java_templates)
 
+    _incremental_apk_only =
+        incremental_apk_by_default && !_use_raw_android_executable
+
     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}"
 
       executable(_exec_target) {
         # Configs will always be defined since we set_defaults in BUILDCONFIG.gn.
         configs = []
         data_deps = []
@@ skipping 71 matching lines @@
         #     target (post-GYP).
         # It's a bit backwards for the apk to depend on the runner script, since
         # the apk is conceptually a runtime_dep of the script. However, it is
         # currently necessary because the bots build this _apk target directly
         # rather than the group() below.
         data_deps = [
           ":$_test_runner_target",
         ]
       }
 
-      # Incremental test targets work only for .apks.
+      _test_runner_target = "${_output_name}__test_runner_script"
+      _incremental_test_name = "${_output_name}_incremental"
       _incremental_test_runner_target =
           "${_output_name}_incremental__test_runner_script"
+      if (_incremental_apk_only) {
+        _incremental_test_name = _output_name
+        _incremental_test_runner_target = _test_runner_target
+      }
+
+      # Incremental test targets work only for .apks.
       test_runner_script(_incremental_test_runner_target) {
         forward_variables_from(invoker,
                                _wrapper_script_vars + [
                                      "data",
                                      "data_deps",
                                      "deps",
                                      "public_deps",
                                    ])
         apk_target = ":$_apk_target"
-        test_name = "${_output_name}_incremental"
+        test_name = _incremental_test_name
         test_type = "gtest"
         test_suite = _output_name
         incremental_install = true
       }
       group("${target_name}_incremental") {
         testonly = true
-        datadeps = [
+        data_deps = [
           ":$_incremental_test_runner_target",
         ]
         deps = [
           ":${_apk_target}_incremental",
         ]
       }
     }
 
-    _test_runner_target = "${_output_name}__test_runner_script"
-    test_runner_script(_test_runner_target) {
-      forward_variables_from(invoker,
-                             _wrapper_script_vars + [
-                                   "data",
-                                   "data_deps",
-                                   "deps",
-                                   "public_deps",
-                                 ])
+    if (!_incremental_apk_only) {
+      test_runner_script(_test_runner_target) {
+        forward_variables_from(invoker,
+                               _wrapper_script_vars + [
+                                     "data",
+                                     "data_deps",
+                                     "deps",
+                                     "public_deps",
+                                   ])
 
-      if (_use_raw_android_executable) {
-        executable_dist_dir = "$root_out_dir/$_dist_target"
-      } else {
-        apk_target = ":$_apk_target"
+        if (_use_raw_android_executable) {
+          executable_dist_dir = "$root_out_dir/$_dist_target"
+        } else {
+          apk_target = ":$_apk_target"
+        }
+        test_name = _output_name
+        test_type = "gtest"
+        test_suite = _output_name
       }
-      test_name = _output_name
-      test_type = "gtest"
-      test_suite = _output_name
     }
 
     group(target_name) {
       testonly = true
-      deps = [
-        ":$_test_runner_target",
-      ]
-      if (_use_raw_android_executable) {
-        deps += [ ":$_dist_target" ]
+      if (_incremental_apk_only) {
+        deps = [
+          ":${target_name}_incremental",
+        ]
       } else {
-        deps += [ ":$_apk_target" ]
+        deps = [
+          ":$_test_runner_target",
+        ]
+        if (_use_raw_android_executable) {
+          deps += [ ":$_dist_target" ]
+        } else {
+          deps += [ ":$_apk_target" ]
+        }
       }
     }
 
     # TODO(GYP_GONE): Delete this after we've converted everything to GN.
     # The _run targets exist only for compatibility w/ GYP.
     group("${target_name}_apk_run") {
       testonly = true
       deps = [
         ":${invoker.target_name}",
       ]
@@ skipping 88 matching lines @@
 }
 
 # Test defaults.
 set_defaults("test") {
   if (is_android) {
     configs = default_shared_library_configs
   } else {
     configs = default_executable_configs
   }
 }