GN(android): Adds extra_native_libs_even_when_incremental to create_apk()

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 1610 matching lines @@
         rebase_path(_native_libs_dir, root_build_dir),
         "--libraries=@FileArg(${_rebased_build_config}:native:libraries)",
         "--filelistjson=$_rebased_native_libs_json",
       ]
     }
   }
 
   _extra_native_libs = []
   _extra_native_libs_deps = []
   if (_native_libs != []) {
+    _extra_native_libs_even_when_incremental = []
+    _extra_native_libs_even_when_incremental_deps = []
+
     if (is_debug) {
-      _extra_native_libs = [ android_gdbserver ]
+      _extra_native_libs_even_when_incremental = [ android_gdbserver ]
     }
 
     if (_use_chromium_linker) {
       _extra_native_libs =
           [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
       _extra_native_libs_deps +=
           [ "//base/android/linker:chromium_android_linker" ]
     }
   }
 
@@ skipping 41 matching lines @@
 
     # This target generates the input file _all_resources_zip_path.
     deps += _android_manifest_deps + [
               ":$build_config_target",
               ":$process_resources_target",
               ":$final_dex_target_name",
             ]
 
     if (_native_libs != [] && !_create_abi_split) {
       deps += _native_libs_deps + _extra_native_libs_deps +
+              _extra_native_libs_even_when_incremental_deps +
               [ _native_libs_file_arg_dep ]
       native_libs_filearg = _native_libs_file_arg
       native_libs = _extra_native_libs
+      native_libs_even_when_incremental =
+          _extra_native_libs_even_when_incremental
 
       # Placeholders necessary for some older devices.
       # http://crbug.com/395038
       forward_variables_from(invoker, [ "native_lib_placeholders" ])
     }
   }
 
   if (_native_libs != [] && _create_abi_split) {
     _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}"
     generate_split_manifest(_manifest_rule) {
@@ skipping 25 matching lines @@
       # Placeholders necessary for some older devices.
       # http://crbug.com/395038
       deps = []
       forward_variables_from(invoker,
                              [
                                "deps",
                                "native_lib_placeholders",
                                "public_deps",
                              ])
 
-      incremental_deps = deps + [ ":$_manifest_rule" ]
+      incremental_deps = deps + _extra_native_libs_even_when_incremental_deps +
+                         [ ":$_manifest_rule" ]
       deps = []
       deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps +
              [ _native_libs_file_arg_dep ]
       native_libs_filearg = _native_libs_file_arg
       native_libs = _extra_native_libs
+      native_libs_even_when_incremental =
+          _extra_native_libs_even_when_incremental
     }
   }
 
   _create_incremental_script_rule_name = "${_template_name}__incremental_script"
   action(_create_incremental_script_rule_name) {
     script = "//build/android/incremental_install/create_install_script.py"
     depfile = "$target_gen_dir/$target_name.d"
     deps = [
       _native_libs_file_arg_dep,
     ]
@@ skipping 18 matching lines @@
       "--dex-file-list=@FileArg($_dex_arg_key)",
       "--depfile=$_rebased_depfile",
     ]
     if (_proguard_enabled) {
       args += [ "--show-proguard-warning" ]
     }
     if (defined(_native_libs_file_arg)) {
       args += [ "--native-libs=$_native_libs_file_arg" ]
     }
     if (_extra_native_libs != []) {
+      # Don't pass in _extra_native_libs_even_when_incremental, since these are
+      # end up in the apk and are not side-loaded.
       _rebased_extra_native_libs =
           rebase_path(_extra_native_libs, root_build_dir)
       args += [ "--native-libs=$_rebased_extra_native_libs" ]
     }
     if (_create_density_splits) {
       args += [ "--split=${_rebased_apk_path_no_ext}-density-*.apk" ]
     }
     if (_create_language_splits) {
       args += [ "--split=${_rebased_apk_path_no_ext}-language-*.apk" ]
     }
@@ skipping 407 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }