GN: asset_location -> android_assets() for mojo_runner

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 62 matching lines @@
   """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:
     dest_path = os.path.basename(src_path)
   return src_path, dest_path
 
 
-def _AddAssets(apk, paths, disable_compression=False):
+def _ExpandPaths(paths):
+  """Converts src:dst into tuples and enumerates files within directories.
+
+  Args:
+    paths: Paths in the form "src_path:dest_path"
+
+  Returns:
+    A list of (src_path, dest_path) tuples sorted by dest_path (for stable
+    ordering within output .apk).
+  """
+  ret = []
+  for path in paths:
+    src_path, dest_path = _SplitAssetPath(path)
+    if os.path.isdir(src_path):
+      for f in build_utils.FindInDirectory(src_path, '*'):
+        ret.append((f, os.path.join(dest_path, f[len(src_path) + 1:])))

[pkotwicz, 2015/11/17 19:34:25]

I think that using os.path.basename() would be clearer

[agrieve, 2015/11/21 01:47:26]

It's not adding the past path component, but rather stripping the path prefix
(there can be multiple directory levels in src_path after the stripping)

+    else:
+      ret.append((src_path, dest_path))
+  ret.sort(key=lambda t:t[1])
+  return ret
+
+
+def _AddAssets(apk, path_tuples, disable_compression=False):
   """Adds the given paths to the apk.
 
   Args:
     apk: ZipFile to write to.
     paths: List of paths (with optional :zipPath suffix) to add.
     disable_compression: Whether to disable compression.
   """
   # Group all uncompressed assets together in the hope that it will increase
   # locality of mmap'ed files.
   for target_compress in (False, True):
-    for path in paths:
-      src_path, dest_path = _SplitAssetPath(path)
+    for src_path, dest_path in path_tuples:
 
       compress = not disable_compression and (
           os.path.splitext(src_path)[1] not in _NO_COMPRESS_EXTENSIONS)
       if target_compress == compress:
         apk_path = 'assets/' + dest_path
         try:
           apk.getinfo(apk_path)
           # Should never happen since write_build_config.py handles merging.
           raise Exception('Multiple targets specified the asset path: %s' %
                           apk_path)
         except KeyError:
           build_utils.AddToZipHermetic(apk, apk_path, src_path=src_path,
                                        compress=compress)
 
 
-def _CreateAssetsList(paths):
+def _CreateAssetsList(path_tuples):
   """Returns a newline-separated list of asset paths for the given paths."""
-  return '\n'.join(_SplitAssetPath(p)[1] for p in sorted(paths)) + '\n'
+  dests = sorted(t[1] for t in path_tuples)
+  return '\n'.join(dests) + '\n'
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   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]
 
-  for path in itertools.chain(options.assets, options.uncompressed_assets):
-    src_path, dest_path = _SplitAssetPath(path)
+  _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:
       # 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:
         if options.write_asset_list:
           data = _CreateAssetsList(
-              itertools.chain(options.assets, options.uncompressed_assets))
+              itertools.chain(_assets, _uncompressed_assets))
           build_utils.AddToZipHermetic(apk, 'assets/assets_list', data=data)
 
-        _AddAssets(apk, options.assets, disable_compression=False)
-        _AddAssets(apk, options.uncompressed_assets, disable_compression=True)
+        _AddAssets(apk, _assets, disable_compression=False)
+        _AddAssets(apk, _uncompressed_assets, disable_compression=True)
 
         for path in native_libs:
           basename = os.path.basename(path)
           apk_path = 'lib/%s/%s' % (options.android_abi, basename)
           build_utils.AddToZipHermetic(apk, apk_path, src_path=path)
         if options.create_placeholder_lib:
           # Make it non-empty so that its checksum is non-zero and is not
           # ignored by md5_check.
           apk_path = 'lib/%s/libplaceholder.so' % options.android_abi
           build_utils.AddToZipHermetic(apk, apk_path, data=':)')
         if options.dex_file:
           build_utils.AddToZipHermetic(apk, 'classes.dex',
                                        src_path=options.dex_file)
 
       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:])