Add incremental_apk_by_default GN arg.

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 2179 matching lines @@
       }
       if (_create_language_splits) {
         args += [ "--split=${_rebased_apk_path_no_ext}-language-*.apk" ]
       }
       if (_load_library_from_apk) {
         args += [ "--dont-even-try=Incremental builds do not work with load_library_from_apk. Try setting is_component_build=true in your GN args." ]
       }
     }
 
     group(target_name) {
-      forward_variables_from(invoker,
-                             [
-                               "data",
-                               "data_deps",
-                             ])
-      public_deps = _final_deps
+      if (incremental_apk_by_default) {
+        deps = [
+          ":${target_name}_incremental",
+        ]
+      } else {
+        forward_variables_from(invoker,
+                               [
+                                 "data",
+                                 "data_deps",
+                               ])
+        public_deps = _final_deps
 
-      # Make the proguard .mapping file easy to find by putting it beside the .apk.
-      if (_proguard_enabled) {
-        deps = [
-          ":$_copy_proguard_mapping_target",
-        ]
+        # Make the proguard .mapping file easy to find by putting it beside the .apk.
+        if (_proguard_enabled) {
+          deps = [
+            ":$_copy_proguard_mapping_target",
+          ]
+        }
       }
     }
     group("${target_name}_incremental") {
       forward_variables_from(invoker,
                              [
                                "data",
                                "data_deps",
                              ])
       if (!defined(data_deps)) {
         data_deps = []
@@ skipping 100 matching lines @@
       deps = []
       data_deps = []
       forward_variables_from(invoker, "*")
       install_script_name = _install_script_name
       deps += [ "//testing/android/broker:broker_java" ]
       data_deps += [
         "//build/android/pylib/device/commands",
         "//tools/android/forwarder2",
         "//tools/android/md5sum",
       ]
-      if (defined(invoker.additional_apks)) {
-        data_deps += invoker.additional_apks
-      }
 
       if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
         # When ProGuard is on, we use ProGuard to combine the under test java
         # code and the test java code. This is to allow us to apply all ProGuard
         # optimizations that we ship with, but not have them break tests. The
         # apk under test will still have the same resources, assets, and
         # manifest, all of which are the ones used in the tests.
         if (!defined(invoker.proguard_configs)) {
           proguard_configs = []
         }
         proguard_configs += [ "//testing/android/proguard_for_test.flags" ]
       }
 
       dist_ijar_path = _dist_ijar_path
       if (defined(invoker.run_findbugs_override)) {
         # Only allow findbugs when there are java files.
         run_findbugs_override =
             invoker.run_findbugs_override && defined(invoker.java_files)
       }
     }
 
     group(target_name) {
-      public_deps = [
-        ":$_apk_target_name",
-        ":$_test_runner_target_name",
+      if (incremental_apk_by_default) {
+        deps = [
+          ":${target_name}_incremental",
+        ]
+      } else {
+        public_deps = [
+          ":$_apk_target_name",
+          ":$_test_runner_target_name",
 
-        # Required by test runner to enumerate test list.
-        ":${_apk_target_name}_dist_ijar",
-      ]
-      if (defined(invoker.apk_under_test)) {
-        public_deps += [ invoker.apk_under_test ]
+          # Required by test runner to enumerate test list.
+          ":${_apk_target_name}_dist_ijar",
+        ]
+        data_deps = []
+        if (defined(invoker.apk_under_test)) {
+          data_deps += [ invoker.apk_under_test ]
+        }
+        if (defined(invoker.additional_apks)) {
+          data_deps += invoker.additional_apks
+        }
       }
     }
 
     # TODO: Delete once recipes no longer use this target.
     group("${target_name}_run") {
       public_deps = [
         ":${invoker.target_name}",
       ]
     }
     group("${target_name}_incremental") {
       public_deps = [
         ":${_apk_target_name}_dist_ijar",
         ":${_apk_target_name}_incremental",
         ":${_test_runner_target_name}_incremental",
       ]
+      data_deps = []
+      if (defined(invoker.additional_apks)) {
+        foreach(_additional_apk, invoker.additional_apks) {
+          data_deps += [ "${_additional_apk}_incremental" ]
+        }
+      }
+
       if (defined(invoker.apk_under_test)) {
-        public_deps += [ "${invoker.apk_under_test}_incremental" ]
+        data_deps += [ "${invoker.apk_under_test}_incremental" ]
       }
     }
   }
 
   # Declare an Android gtest apk
   #
   # This target creates an Android apk for running gtest-based unittests.
   #
   # Variables
   #   deps: Specifies the dependencies of this target. These will be passed to
@@ skipping 389 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }