GN(android): Adds extra_native_libs_even_when_incremental to create_apk()

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index fe8e24f175a1fb2a4b42f45c005cde363355d031..6a30b1e6f162d61e4db09797095133611bb37fdc 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1628,8 +1628,11 @@ template("android_apk") {
   _extra_native_libs = []
   _extra_native_libs_deps = []
   if (_native_libs != []) {
+    _extra_native_libs_even_when_incremental = []
+    _extra_native_libs_even_when_incremental_deps = []

[pkotwicz, 2015/12/01 16:50:14]

Nit: Move these outside the if statement

[agrieve, 2015/12/01 17:57:36]

Causes "goes out of scope without being used" errors :S

+
     if (is_debug) {
-      _extra_native_libs = [ android_gdbserver ]
+      _extra_native_libs_even_when_incremental = [ android_gdbserver ]
     }
 
     if (_use_chromium_linker) {
@@ -1691,9 +1694,12 @@ template("android_apk") {
 
     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
@@ -1739,12 +1745,15 @@ template("android_apk") {
                                "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
     }
   }