Android: Fix incremental builds not noticing when assets change

build/android/gyp/apkbuilder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Adds the code parts to a resource APK."""
 
 import argparse
 import itertools
@@ skipping 171 matching lines @@
                                  src_path=path,
                                  compress=compress)
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
 
   native_libs = sorted(options.native_libs)
 
-  input_paths = [options.resource_apk, __file__] + native_libs
+  input_paths = [options.resource_apk, __file__]
   # Include native libs in the depfile_deps since GN doesn't know about the
   # dependencies when is_component_build=true.
   depfile_deps = list(native_libs)
 
   secondary_native_libs = []
   if options.secondary_native_libs:
     secondary_native_libs = sorted(options.secondary_native_libs)
-    input_paths += secondary_native_libs
     depfile_deps += secondary_native_libs
 
   if options.dex_file:
     input_paths.append(options.dex_file)
 
   input_strings = [options.android_abi,
                    options.native_lib_placeholders,
                    options.uncompress_shared_libraries]
 
   if options.secondary_android_abi:
     input_strings.append(options.secondary_android_abi)
 
   if options.java_resources:
-    input_paths.extend(options.java_resources)
+    # Included via .build_config, so need to write it to depfile.
+    depfile_deps.extend(options.java_resources)
 
   _assets = _ExpandPaths(options.assets)
   _uncompressed_assets = _ExpandPaths(options.uncompressed_assets)
 
   for src_path, dest_path in itertools.chain(_assets, _uncompressed_assets):
-    input_paths.append(src_path)
+    # Included via .build_config, so need to write it to depfile.
+    depfile_deps.append(src_path)
     input_strings.append(dest_path)
 
   def on_stale_md5():
     tmp_apk = options.output_apk + '.tmp'
     try:
       # TODO(agrieve): It would be more efficient to combine this step
       # with finalize_apk(), which sometimes aligns and uncompresses the
       # native libraries.
       with zipfile.ZipFile(options.resource_apk) as resource_apk, \
            zipfile.ZipFile(tmp_apk, 'w', zipfile.ZIP_DEFLATED) as out_apk:
@@ skipping 71 matching lines @@
                   out_apk, apk_path, data=java_resource_jar.read(apk_path))
 
       shutil.move(tmp_apk, options.output_apk)
     finally:
       if os.path.exists(tmp_apk):
         os.unlink(tmp_apk)
 
   build_utils.CallAndWriteDepfileIfStale(
       on_stale_md5,
       options,
-      input_paths=input_paths,
+      input_paths=input_paths + depfile_deps,
       input_strings=input_strings,
       output_paths=[options.output_apk],
       depfile_deps=depfile_deps)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])