GN(android): Adds extra_native_libs_even_when_incremental to create_apk()

build/config/android/internal_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("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 828 matching lines @@
     _deps = invoker.deps
   }
   _incremental_deps = []
   if (defined(invoker.incremental_deps)) {
     _incremental_deps = invoker.incremental_deps
   }
   _native_libs = []
   if (defined(invoker.native_libs)) {
     _native_libs = invoker.native_libs
   }
+  _native_libs_even_when_incremental = []
+  if (defined(invoker.native_libs_even_when_incremental)) {
+    _native_libs_even_when_incremental =
+        invoker.native_libs_even_when_incremental
+  }
 
   # TODO(agrieve): Remove support for asset_location in favor of using
   # android_assets() everywhere (http://crbug.com/547162).
   if (defined(invoker.asset_location)) {
     _asset_location = invoker.asset_location
     assert(_asset_location != "")  # Mark as used.
   }
 
   _version_code = invoker.version_code
   _version_name = invoker.version_name
@@ skipping 158 matching lines @@
   package_apk(package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
                              "native_lib_placeholders",
                              "native_libs_filearg",
                              "write_asset_list",
                            ])
     deps = _deps + [ ":${_package_resources_target_name}" ]
-    native_libs = _native_libs
+    native_libs = _native_libs + _native_libs_even_when_incremental
 
     if (defined(_dex_path)) {
       dex_path = _dex_path
     }
 
     output_apk_path = _packaged_apk_path
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _incremental_package_target = "${target_name}_incremental__package"
   package_apk(_incremental_package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
                            ])
     _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
     deps = _incremental_deps + [
              ":${_incremental_package_resources_target_name}",
              _dex_target,
            ]
 
     if (defined(_dex_path)) {
       dex_path =
           get_label_info(_dex_target, "target_gen_dir") + "/bootstrap.dex"
     }
 
-    native_libs = []
+    native_libs = _native_libs_even_when_incremental
 
     # http://crbug.com/384638
     _has_native_libs =
         defined(invoker.native_libs_filearg) || _native_libs != []
-    if (_has_native_libs) {
+    if (_has_native_libs && _native_libs_even_when_incremental == []) {
       native_lib_placeholders = [ "libfix.crbug.384638.so" ]
     }
 
     output_apk_path = _incremental_packaged_apk_path
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   _finalize_apk_rule_name = "${target_name}__finalize"
   finalize_apk(_finalize_apk_rule_name) {
     input_apk_path = _packaged_apk_path
@@ skipping 929 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }