Port placeholders logic GYP->GN

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 30 matching lines @@
                       help='Path to the output file',
                       required=True)
   parser.add_argument('--dex-file',
                       help='Path to the classes.dex to use')
   # TODO(agrieve): Switch this to be a list of files rather than a directory.
   parser.add_argument('--native-libs-dir',
                       help='Directory containing native libraries to include',
                       default=[])
   parser.add_argument('--android-abi',
                       help='Android architecture to use for native libraries')
-  parser.add_argument('--create-placeholder-lib',
-                      action='store_true',
-                      help='Whether to add a dummy library file')
+  parser.add_argument('--native-lib-placeholders',
+                      help='GYP-list of native library placeholders to add.',
+                      default='[]')
   options = parser.parse_args(args)
   if not options.android_abi and (options.native_libs_dir or
-                                  options.create_placeholder_lib):
+                                  options.native_lib_placeholders):
     raise Exception('Must specify --android-abi with --native-libs-dir')
   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)
   return options
 
 
 def _ListSubPaths(path):
   """Returns a list of full paths to all files in the given path."""
   return [os.path.join(path, name) for name in os.listdir(path)]
 
 
 def _SplitAssetPath(path):
   """Returns (src, dest) given an asset path in the form src[:dest]."""
@@ skipping 41 matching lines @@
   options = _ParseArgs(args)
 
   native_libs = []
   if options.native_libs_dir:
     native_libs = _ListSubPaths(options.native_libs_dir)
 
   input_paths = [options.resource_apk, __file__] + native_libs
   if options.dex_file:
     input_paths.append(options.dex_file)
 
-  input_strings = [options.create_placeholder_lib, options.android_abi]
+  input_strings = [options.android_abi, options.native_lib_placeholders]
 
   for path in itertools.chain(options.assets, options.uncompressed_assets):
     src_path, dest_path = _SplitAssetPath(path)
     input_paths.append(src_path)
     input_strings.append(dest_path)
 
   def on_stale_md5():
     tmp_apk = options.output_apk + '.tmp'
     try:
       # Use a temp file to avoid creating an output if anything goes wrong.
       shutil.copyfile(options.resource_apk, tmp_apk)
 
       # TODO(agrieve): It would be more efficient to combine this step
       # with finalize_apk(), which sometimes aligns and uncompresses the
       # native libraries.
       with zipfile.ZipFile(tmp_apk, 'a', zipfile.ZIP_DEFLATED) as apk:
         _AddAssets(apk, options.assets, disable_compression=False)
         _AddAssets(apk, options.uncompressed_assets, disable_compression=True)
         for path in native_libs:
           basename = os.path.basename(path)
           apk.write(path, 'lib/%s/%s' % (options.android_abi, basename))
-        if options.create_placeholder_lib:
+        for name in options.native_lib_placeholders:
           # Make it non-empty so that its checksum is non-zero and is not
           # ignored by md5_check.
-          apk.writestr('lib/%s/libplaceholder.so' % options.android_abi, ':-)')
+          apk.writestr('lib/%s/%s' % (options.android_abi, name), ':)',

[pkotwicz, 2015/11/16 19:28:22]

:-)

+                       zipfile.ZIP_STORED)
         if options.dex_file:
           apk.write(options.dex_file, 'classes.dex')
 
       shutil.move(tmp_apk, options.output_apk)
     finally:
       if os.path.exists(tmp_apk):
         os.unlink(tmp_apk)
 
   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:])