Create *_managed targets for android_apk()s

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.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1144 matching lines @@
   if (defined(invoker.final_apk_path)) {
     _final_apk_path = invoker.final_apk_path
   } else if (defined(invoker.apk_name)) {
     _final_apk_path = "$root_build_dir/apks/" + invoker.apk_name + ".apk"
   }
   _dist_jar_path_list =
       process_file_template(
           [ _final_apk_path ],
           "$root_build_dir/test.lib.java/{{source_name_part}}.jar")
   _dist_jar_path = _dist_jar_path_list[0]
+  _final_apk_path_no_ext_list =
+      process_file_template([ _final_apk_path ],
+                            "{{source_dir}}/{{source_name_part}}")
+  _final_apk_path_no_ext = _final_apk_path_no_ext_list[0]
+  assert(_final_apk_path_no_ext != "")  # Mark as used.
 
   _native_libs = []
 
   _version_code = "1"
   if (defined(invoker.version_code)) {
     _version_code = invoker.version_code
   }
 
   _version_name = "Developer Build"
   if (defined(invoker.version_name)) {
@@ skipping 105 matching lines @@
     android_manifest = _android_manifest
 
     deps = _chromium_linker_dep + _android_manifest_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     native_libs = _native_libs
   }
 
-  final_deps = []
+  _final_deps = []
+  _incremental_final_deps = []
 
   process_resources_target = "${_template_name}__process_resources"
-  final_deps += [ ":$process_resources_target" ]
   process_resources(process_resources_target) {
     forward_variables_from(invoker, [ "include_all_resources" ])
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     r_text_path = "${target_gen_dir}/${target_name}_R.txt"
     android_manifest = _android_manifest
     resource_dirs = [ "//build/android/ant/empty/res" ]
     zip_path = resources_zip_path
     all_resources_zip_path = _all_resources_zip_path
     generate_constant_ids = true
 
@@ skipping 38 matching lines @@
         defines += [ "ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE" ]
       }
       if (_enable_chromium_linker_tests) {
         defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ]
       }
     }
     _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
   }
 
   java_target = "${_template_name}__java"
-  final_deps += [ ":$java_target" ]
   java_library_impl(java_target) {
     forward_variables_from(invoker, [ "run_findbugs" ])
     supports_android = true
     requires_android = true
     override_build_config = _build_config
     deps = _android_manifest_deps + [ ":$build_config_target" ]
 
     android_manifest = _android_manifest
     chromium_code = true
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     } else if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     } else {
       java_files = []
     }
     srcjar_deps = _srcjar_deps
     dex_path = base_path + ".dex.jar"
 
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 
   if (_dist_jar_path != "") {
     create_dist_target = "${_template_name}__create_dist_jar"
-    final_deps += [ ":$create_dist_target" ]
+    _final_deps += [ ":$create_dist_target" ]
+    _incremental_final_deps += [ ":$create_dist_target" ]
 
     # TODO(cjhopman): This is only ever needed to calculate the list of tests to
     # run. See build/android/pylib/instrumentation/test_jar.py. We should be
     # able to just do that calculation at build time instead.
     action(create_dist_target) {
       script = "//build/android/gyp/create_dist_jar.py"
       depfile = "$target_gen_dir/$target_name.d"
       inputs = [
         _build_config,
       ]
@@ skipping 11 matching lines @@
       inputs += [ jar_path ]
       _rebased_jar_path = rebase_path([ jar_path ], root_build_dir)
       args += [ "--inputs=$_rebased_jar_path" ]
       deps = [
         ":$build_config_target",  # Generates the build config file.
         ":$java_target",  # Generates the jar file.
       ]
     }
   }
 
-  final_deps += [ ":$final_dex_target_name" ]
   dex("$final_dex_target_name") {
     deps = [
       ":$build_config_target",
       ":$java_target",
     ]
     sources = [
       jar_path,
     ]
     inputs = [
       _build_config,
@@ skipping 54 matching lines @@
       }
 
       if (is_debug) {
         rebased_gdbserver = rebase_path([ android_gdbserver ], root_build_dir)
         inputs += [ android_gdbserver ]
         args += [ "--libraries=$rebased_gdbserver" ]
       }
     }
   }
 
-  final_deps += [ ":${_template_name}__create" ]
+  _final_deps += [ ":${_template_name}__create" ]
+  _incremental_final_deps += [ ":${_template_name}__create_incremental" ]
   create_apk("${_template_name}__create") {
     forward_variables_from(invoker, [ "language_splits" ])
     apk_path = _final_apk_path
     android_manifest = _android_manifest
     resources_zip = _all_resources_zip_path
     dex_path = final_dex_path
     load_library_from_apk = _load_library_from_apk
     create_density_splits = _create_density_splits
     if (defined(invoker.extensions_to_not_compress)) {
       extensions_to_not_compress = invoker.extensions_to_not_compress
@@ skipping 41 matching lines @@
     _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}"
     generate_split_manifest(_manifest_rule) {
       main_manifest = _android_manifest
       out_manifest =
           "$gen_dir/split-manifests/${android_app_abi}/AndroidManifest.xml"
       split_name = "abi_${android_app_abi}"
       deps = _android_manifest_deps
     }
 
     _apk_rule = "${_template_name}__split_apk_abi_${android_app_abi}"
-    final_deps += [ ":$_apk_rule" ]
+    _final_deps += [ ":$_apk_rule" ]
+
+    # Don't add this to _incremental_final_deps since for incremental installs
+    # we skip abi splits altogether.
     create_apk(_apk_rule) {
-      _split_paths = process_file_template(
-              [ _final_apk_path ],
-              "{{source_dir}}/{{source_name_part}}-abi-${android_app_abi}.apk")
-      apk_path = _split_paths[0]
+      apk_path = "${_final_apk_path_no_ext}-abi-${android_app_abi}.apk"
       base_path = "$gen_dir/$_apk_rule"
 
       manifest_outputs = get_target_outputs(":${_manifest_rule}")
       android_manifest = manifest_outputs[1]
       load_library_from_apk = _load_library_from_apk
 
       version_code = _version_code
       version_name = _version_name
 
       keystore_name = _keystore_name
       keystore_path = _keystore_path
       keystore_password = _keystore_password
 
       native_libs_dir = _native_libs_dir
       deps = [
         ":${_template_name}__prepare_native",
         ":${_manifest_rule}",
       ]
     }
   }
 
   group(target_name) {
     forward_variables_from(invoker, [ "data_deps" ])
-    deps = final_deps
+    deps = _final_deps
+  }
+  group("${target_name}_incremental") {
+    deps = _incremental_final_deps
+    if (defined(invoker.data_deps)) {
+      data_deps = invoker.data_deps
+    }
   }
 }
 
 # Declare an Android instrumentation test apk
 #
 # This target creates an Android instrumentation test apk.
 #
 # Variables
 #   android_manifest: Path to AndroidManifest.xml.
 #   data_deps: List of dependencies needed at runtime. These will be built but
@@ skipping 369 matching lines @@
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }