Add incremental_apk_by_default GN arg.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 91d84cc48dd514cc274735a92ddcd3ccd3bfea8f..e8d3a572b2e571ef4d773fb0040d27dfcf18f357 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -2197,18 +2197,24 @@ if (enable_java_templates) {
     }
 
     group(target_name) {
-      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) {
+      if (incremental_apk_by_default) {
         deps = [
-          ":$_copy_proguard_mapping_target",
+          ":${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",
+          ]
+        }
       }
     }
     group("${target_name}_incremental") {
@@ -2329,9 +2335,6 @@ if (enable_java_templates) {
         "//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
@@ -2354,15 +2357,25 @@ if (enable_java_templates) {
     }
 
     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
+        }
       }
     }
 
@@ -2378,8 +2391,15 @@ if (enable_java_templates) {
         ":${_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" ]
       }
     }
   }