Make secondary abi work for component build

build/android/gyp/write_build_config.py

Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 1843c7481b0086503f351fba3d1f58142a2fbb17..41eb800655bfa44692777f5a592ef28c76ca3647 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -264,6 +264,9 @@ def main(argv):
   parser.add_option('--shared-libraries-runtime-deps',
                     help='Path to file containing runtime deps for shared '
                          'libraries.')
+  parser.add_option('--secondary-abi-shared-libraries-runtime-deps',
+                    help='Path to file containing runtime deps for secondary '
+                         'abi shared libraries.')
 
   # apk options
   parser.add_option('--apk-path', help='Path to the target\'s apk output.')
@@ -634,10 +637,22 @@ def main(argv):
       java_libraries_list = ('{%s}' % ','.join(
           ['"%s"' % s[3:-3] for s in library_paths]))
 
+    secondary_abi_library_paths = []
+    secondary_abi_java_libraries_list = None
+    secondary_abi_runtime_deps_files = build_utils.ParseGnList(
+        options.secondary_abi_shared_libraries_runtime_deps or '[]')
+    if secondary_abi_runtime_deps_files:
+      secondary_abi_library_paths = _ExtractSharedLibsFromRuntimeDeps(
+          secondary_abi_runtime_deps_files)
+      secondary_abi_java_libraries_list = ('{%s}' % ','.join(

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

nit: this line is non-trivial. Would be better as a helper function I think.

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

Done.

+          ['"%s"' % s[3:-3] for s in secondary_abi_library_paths]))
+
     all_inputs.extend(runtime_deps_files)
     config['native'] = {
       'libraries': library_paths,
+      'secondary_abi_libraries': secondary_abi_library_paths,
       'java_libraries_list': java_libraries_list,
+      'secondary_abi_java_libraries_list': secondary_abi_java_libraries_list,
     }
     config['assets'], config['uncompressed_assets'] = (
         _MergeAssets(deps.All('android_assets')))