Make secondary abi work for component build

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_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
+import("//third_party/android_platform/config.gni")
 
 assert(is_android)
 
 # These identify targets that have .build_config files (except for android_apk,
 # java_binary, resource_rewriter, since we never need to depend on these).
 _java_target_whitelist = [
   "*:*_java",
   "*:*_javalib",
   "*:*_java_*",  # e.g. java_test_support
   "*:java",
@@ skipping 276 matching lines @@
         # Don't list shared_libraries_runtime_deps_file as an input in order to
         # avoid having to depend on the runtime_deps target. See comment in
         # rules.gni for why we do this.
         args += [
           "--shared-libraries-runtime-deps",
           rebase_path(invoker.shared_libraries_runtime_deps_file,
                       root_build_dir),
         ]
       }
 
+      if (defined(invoker.secondary_abi_shared_libraries_runtime_deps_file)) {
+        # Don't list secondary_abi_shared_libraries_runtime_deps_file as an
+        # input in order to avoid having to depend on the runtime_deps target.
+        # See comment in rules.gni for why we do this.
+        args += [
+          "--secondary-abi-shared-libraries-runtime-deps",
+          rebase_path(invoker.secondary_abi_shared_libraries_runtime_deps_file,
+                      root_build_dir),
+        ]
+      }
+
       if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
         args += [
           "--proguard-enabled",
           "--proguard-info",
           rebase_path(invoker.proguard_info, root_build_dir),
         ]
       }
 
       if (defined(invoker.apk_path)) {
         _rebased_apk_path = rebase_path(invoker.apk_path, root_build_dir)
@@ skipping 958 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 != []) {
+
+      # TODO (michaelbai): Remove the secondary_native_libs variable.
+      if (defined(invoker.secondary_abi_native_libs_filearg)) {
+        assert(defined(android_app_secondary_abi))
+        args += [
+          "--secondary-native-libs=${invoker.secondary_abi_native_libs_filearg}",
+          "--secondary-android-abi=$android_app_secondary_abi",
+        ]
+      } else 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) {
@@ skipping 307 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_abi_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
       }
@@ skipping 1026 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }
+
+template("pack_relocation_section") {
+  assert(defined(invoker.file_list_json))
+  assert(defined(invoker.libraries_filearg))
+  action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                             "file_list_json",

[agrieve, 2016/09/08 01:02:15]

nit: don't forward file_list_json and libraries_filearg since they aren't
actually being "forwarded" to action(). Instead, just use invoker. to reference
them below.

[michaelbai, 2016/09/08 18:52:51]

Thanks, sometime, I am confused about what should be forward.

+                             "inputs",
+                             "libraries_filearg",
+                             "testonly",
+                           ])
+    script = "//build/android/gyp/pack_relocations.py"
+    depfile = "$target_gen_dir/$target_name.d"
+    packed_libraries_dir = "$target_gen_dir/$target_name/packed-libs"

[agrieve, 2016/09/08 01:02:15]

nit: prefix with _

[michaelbai, 2016/09/08 18:52:51]

Done.

+    outputs = [
+      file_list_json,
+    ]
+    deps += [ relocation_packer_target ]
+
+    args = [
+      "--depfile",
+      rebase_path(depfile, root_build_dir),
+      "--enable-packing=1",
+      "--android-pack-relocations",
+      rebase_path(relocation_packer_exe, root_build_dir),
+      "--stripped-libraries-dir",
+      rebase_path(root_build_dir, root_build_dir),
+      "--packed-libraries-dir",
+      rebase_path(packed_libraries_dir, root_build_dir),
+      "--libraries=$libraries_filearg",
+      "--filelistjson",
+      rebase_path(file_list_json, root_build_dir),
+    ]
+  }
+}