Support packaging secondary abi native libraries in APK.

build/android/gyp/apkbuilder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2015 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.
 
 """Adds the code parts to a resource APK."""
 
 import argparse
 import itertools
@@ skipping 32 matching lines @@
   parser.add_argument('--output-apk',
                       help='Path to the output file',
                       required=True)
   parser.add_argument('--dex-file',
                       help='Path to the classes.dex to use')
   parser.add_argument('--native-libs',
                       action='append',
                       help='GYP-list of native libraries to include. '
                            'Can be specified multiple times.',
                       default=[])
+  parser.add_argument('--secondary-native-libs',
+                      action='append',
+                      help='The libraries for secondary android-abi. '

[agrieve, 2016/03/23 18:11:19]

You should say that this is a GYP-list

[michaelbai, 2016/03/23 18:55:33]

Done.

+                           'Can be specified multiple times.',
+                      default=[])
   parser.add_argument('--android-abi',
                       help='Android architecture to use for native libraries')
+  parser.add_argument('--secondary-android-abi',
+                      help='The secondary Android architecture to use for'
+                           'secondary native libraries')
   parser.add_argument('--native-lib-placeholders',
                       help='GYP-list of native library placeholders to add.',
                       default='[]')
   parser.add_argument('--emma-device-jar',
                       help='Path to emma_device.jar to include.')
   parser.add_argument('--uncompress-shared-libraries',
                       action='store_true',
                       help='Uncompress shared libraries')
   options = parser.parse_args(args)
   options.assets = build_utils.ParseGypList(options.assets)
   options.uncompressed_assets = build_utils.ParseGypList(
       options.uncompressed_assets)
   options.native_lib_placeholders = build_utils.ParseGypList(
       options.native_lib_placeholders)
   all_libs = []
   for gyp_list in options.native_libs:
     all_libs.extend(build_utils.ParseGypList(gyp_list))
   options.native_libs = all_libs
+  secondary_libs = []
+  for gyp_list in options.secondary_native_libs:
+    secondary_libs.extend(build_utils.ParseGypList(gyp_list))
+  options.secondary_native_libs = secondary_libs
+
 
   if not options.android_abi and (options.native_libs or
                                   options.native_lib_placeholders):
     raise Exception('Must specify --android-abi with --native-libs')
+  if not options.secondary_android_abi and options.secondary_native_libs:
+    raise Exception('Must specify --secondary-android-abi with'
+                    ' --secondary-native-libs')
   return options
 
 
 def _SplitAssetPath(path):
   """Returns (src, dest) given an asset path in the form src[:dest]."""
   path_parts = path.split(':')
   src_path = path_parts[0]
   if len(path_parts) > 1:
     dest_path = path_parts[1]
   else:
@@ skipping 49 matching lines @@
           build_utils.AddToZipHermetic(apk, apk_path, src_path=src_path,
                                        compress=compress)
 
 
 def _CreateAssetsList(path_tuples):
   """Returns a newline-separated list of asset paths for the given paths."""
   dests = sorted(t[1] for t in path_tuples)
   return '\n'.join(dests) + '\n'
 
 
+def _AddNativeLibraries(out_apk, native_libs, android_abi, uncompress):
+  """Add native libraries to APK."""
+  for path in native_libs:
+    basename = os.path.basename(path)
+    apk_path = 'lib/%s/%s' % (android_abi, basename)
+
+    compress = None
+    if (uncompress and os.path.splitext(basename)[1] == '.so'):
+      compress = False
+
+    build_utils.AddToZipHermetic(out_apk,
+                                 apk_path,
+                                 src_path=path,
+                                 compress=compress)
+
+
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
 
   native_libs = sorted(options.native_libs)
 
   input_paths = [options.resource_apk, __file__] + native_libs
+
+  secondary_native_libs = []
+  if options.secondary_native_libs:
+    secondary_native_libs = sorted(options.secondary_native_libs)
+    input_paths += secondary_native_libs
+
   if options.dex_file:
     input_paths.append(options.dex_file)
 
   if options.emma_device_jar:
     input_paths.append(options.emma_device_jar)
 
   input_strings = [options.android_abi,
                    options.native_lib_placeholders,
                    options.uncompress_shared_libraries]
 
+  if options.secondary_android_abi:
+    input_strings.append(options.secondary_android_abi)
+
   _assets = _ExpandPaths(options.assets)
   _uncompressed_assets = _ExpandPaths(options.uncompressed_assets)
 
   for src_path, dest_path in itertools.chain(_assets, _uncompressed_assets):
     input_paths.append(src_path)
     input_strings.append(dest_path)
 
   def on_stale_md5():
     tmp_apk = options.output_apk + '.tmp'
     try:
@@ skipping 28 matching lines @@
         # 3. Dex files
         if options.dex_file and options.dex_file.endswith('.zip'):
           with zipfile.ZipFile(options.dex_file, 'r') as dex_zip:
             for dex in (d for d in dex_zip.namelist() if d.endswith('.dex')):
               build_utils.AddToZipHermetic(out_apk, dex, data=dex_zip.read(dex))
         elif options.dex_file:
           build_utils.AddToZipHermetic(out_apk, 'classes.dex',
                                        src_path=options.dex_file)
 
         # 4. Native libraries.
-        for path in native_libs:
-          basename = os.path.basename(path)
-          apk_path = 'lib/%s/%s' % (options.android_abi, basename)
+        _AddNativeLibraries(out_apk,
+                            native_libs,
+                            options.android_abi,
+                            options.uncompress_shared_libraries)
 
-          compress = None
-          if (options.uncompress_shared_libraries and
-              os.path.splitext(basename)[1] == '.so'):
-            compress = False
-
-          build_utils.AddToZipHermetic(out_apk,
-                                       apk_path,
-                                       src_path=path,
-                                       compress=compress)
+        if options.secondary_android_abi:
+          _AddNativeLibraries(out_apk,
+                              secondary_native_libs,
+                              options.secondary_android_abi,
+                              options.uncompress_shared_libraries)
 
         for name in sorted(options.native_lib_placeholders):
           # Empty libs files are ignored by md5check, but rezip requires them
           # to be empty in order to identify them as placeholders.
           apk_path = 'lib/%s/%s' % (options.android_abi, name)
           build_utils.AddToZipHermetic(out_apk, apk_path, data='')
 
         # 5. Resources
         for info in resource_infos[1:]:
           copy_resource(info)
@@ skipping 25 matching lines @@
   build_utils.CallAndWriteDepfileIfStale(
       on_stale_md5,
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.output_apk])
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])