GN: Fix incremental install failing on some 64 bit devices

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/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 461 matching lines @@
 }
 
 # Creates an unsigned .apk.
 #
 # Variables
 #   deps: Specifies the dependencies of this target.
 #   dex_path: Path to classes.dex file to include (optional).
 #   resource_packaged_apk_path: Path to .ap_ to use.
 #   output_apk_path: Output path for the generated .apk.
 #   native_libs_dir: Directory containing native libraries.
+#   create_placeholder_lib: Whether to add a dummy lib to the apk.
 template("package_apk") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
                              "public_deps",
                              "testonly",
                            ])
+    _create_placeholder_lib = defined(invoker.create_placeholder_lib) &&
+                              invoker.create_placeholder_lib
+
     script = "//build/android/gyp/apkbuilder.py"
     depfile = "$target_gen_dir/$target_name.d"
     data_deps = [
       "//tools/android/md5sum",
     ]  # Used when deploying APKs
 
     inputs = [
       invoker.resource_packaged_apk_path,
     ]
     if (defined(invoker.dex_path)) {
@@ skipping 12 matching lines @@
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--resource-apk=$_rebased_resource_packaged_apk_path",
       "--output-apk=$_rebased_packaged_apk_path",
     ]
     if (defined(invoker.dex_path)) {
       _rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
       args += [ "--dex-file=$_rebased_dex_path" ]
     }
+    if (defined(invoker.native_libs_dir) || _create_placeholder_lib) {
+      args += [ "--android-abi=$android_app_abi" ]
+    }
     if (defined(invoker.native_libs_dir)) {
       _rebased_native_libs_dir =
           rebase_path(invoker.native_libs_dir, root_build_dir)
-      args += [
-        "--native-libs-dir=$_rebased_native_libs_dir/$android_app_abi",
-        "--android-abi=$android_app_abi",
-      ]
+      args += [ "--native-libs-dir=$_rebased_native_libs_dir/$android_app_abi" ]
+    }
+    if (_create_placeholder_lib) {
+      args += [ "--create-placeholder-lib" ]
     }
   }
 }
 
 # Signs & zipaligns an apk.
 #
 # Variables
 #   input_apk_path: Path of the .apk to be finalized.
 #   output_apk_path: Output path for the generated .apk.
 #   keystore_path: Path to keystore to use for signing.
@@ skipping 267 matching lines @@
     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"
     }
 
-    # TODO(agrieve): Add a placeholder .so for http://crbug.com/384638
+    # http://crbug.com/384638
+    if (defined(invoker.native_libs_dir)) {
+      create_placeholder_lib = true
+    }
+
     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
     output_apk_path = _final_apk_path
     keystore_path = _keystore_path
     keystore_name = _keystore_name
@@ skipping 819 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }