GN: Add missing deps for incremental apks.

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 1433 matching lines @@
     ]
     output = final_dex_path
     _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
     args = [
       "--inputs=@FileArg($_dex_arg_key)",
       _rebased_lib_dex_path,
     ]
   }
 
   if (_native_libs != []) {
-    action("${_template_name}__prepare_native") {
+    _prepare_native_target_name = "${_template_name}__prepare_native"
+    action(_prepare_native_target_name) {
       forward_variables_from(invoker,
                              [
                                "data_deps",
                                "public_deps",
                              ])
       script = "//build/android/gyp/pack_relocations.py"
       packed_libraries_dir = "$_native_libs_dir/$android_app_abi"
       depfile = "$target_gen_dir/$target_name.d"
       outputs = [
         depfile,
@@ skipping 67 matching lines @@
 
     keystore_name = _keystore_name
     keystore_path = _keystore_path
     keystore_password = _keystore_password
 
     # This target generates the input file _all_resources_zip_path.
     deps = _android_manifest_deps + [
              ":$process_resources_target",
              ":$final_dex_target_name",
            ]
-    incremental_deps = _android_manifest_deps + [ ":$process_resources_target" ]
+    incremental_deps = _android_manifest_deps + [
+                         ":$java_target",

[pkotwicz, 2015/09/24 21:31:53]

I wonder whether we should add $java_target to deps in addition to
incremental_deps

What steps did you do to get a build failure? (I want to reproduce it to better
understand the issue). I understand that "final_dex_target_name" depends on
"java_target". However, I do not yet understand why the "java_target" dependency
is important here

[agrieve, 2015/09/24 22:22:57]

We shouldn't add it to deps, because it's not a direct dependency of the actual
apk. The actual APK needs only the classes.dex file, which includes $java_target
in it.

The template actually also doesn't need $java_target. I should have added it to
_incremental_final_deps, which I've now done.

To test it out, build any APK and add _incremental. 
e.g. ninja chrome_public_apk_incremental
Then run:
out-gn/Debug/bin/install_incremental_chrome_public_apk

+                         ":$process_resources_target",
+                       ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
       incremental_deps += invoker.deps
     }
 
     if (defined(invoker.asset_location)) {
       asset_location = invoker.asset_location
 
       # We don't know the exact dependencies that create the assets in
       # |asset_location|; we depend on all caller deps until a better solution
       # is figured out (http://crbug.com/433330).
       if (defined(invoker.deps)) {
         deps += invoker.deps

[pkotwicz, 2015/09/24 21:31:53]

This is a no-op?

[agrieve, 2015/09/24 22:22:57]

hmm, yes it is! Removed.

       }
     }
 
     if (_native_libs != [] && !_create_abi_split) {
       native_libs_dir = _native_libs_dir
-      deps += [ ":${_template_name}__prepare_native" ]
+      deps += [ ":$_prepare_native_target_name" ]
+      incremental_deps += [ ":$_prepare_native_target_name" ]
     }
   }
 
   if (_native_libs != [] && _create_abi_split) {
     _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}"
@@ skipping 15 matching lines @@
 
       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",
+        ":${_prepare_native_target_name}",
         ":${_manifest_rule}",
       ]
       incremental_deps = deps
     }
   }
 
   _create_incremental_script_rule_name = "${_template_name}__incremental_script"
   _incremental_final_deps += [ ":${_create_incremental_script_rule_name}" ]
   action(_create_incremental_script_rule_name) {
     script = "//build/android/incremental_install/create_install_script.py"
@@ skipping 425 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) {
   }
 }