Support packaging secondary abi native libraries in 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 752 matching lines @@
     if (invoker.native_libs != []) {
       _rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir)
       args += [ "--native-libs=$_rebased_native_libs" ]
     }
     if (defined(invoker.native_libs_filearg)) {
       args += [ "--native-libs=${invoker.native_libs_filearg}" ]
     }
     if (_native_lib_placeholders != []) {
       args += [ "--native-lib-placeholders=$_native_lib_placeholders" ]
     }
+    if (defined(invoker.secondary_native_libs) &&
+        invoker.secondary_native_libs != []) {
+      assert(defined(android_app_secondary_abi))
+      inputs += invoker.secondary_native_libs
+      _secondary_native_libs = rebase_path(invoker.secondary_native_libs)
+      args += [
+        "--secondary-native-libs=$_secondary_native_libs",
+        "--secondary-android-abi=$android_app_secondary_abi",
+      ]
+    }
 
     if (defined(invoker.emma_instrument) && invoker.emma_instrument) {
       _emma_device_jar = "$android_sdk_root/tools/lib/emma_device.jar"
       _rebased_emma_device_jar = rebase_path(_emma_device_jar, root_build_dir)
       args += [ "--emma-device-jar=$_rebased_emma_device_jar" ]
     }
 
     if (defined(invoker.uncompress_shared_libraries) &&
         invoker.uncompress_shared_libraries) {
       args += [ "--uncompress-shared-libraries" ]
@@ skipping 296 matching lines @@
   }
 
   package_target = "${target_name}__package"
   package_apk(package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
                              "native_lib_placeholders",
                              "native_libs_filearg",
+                             "secondary_native_libs",
                              "uncompress_shared_libraries",
                              "write_asset_list",
                            ])
     deps = _deps + [ ":${_package_resources_target_name}" ]
     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",
+                             "secondary_native_libs",
                              "uncompress_shared_libraries",
                            ])
     _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 =
@@ skipping 1051 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }