Add GN template for android_assets(). Use it in content_shell_apk.

build/android/gyp/apkbuilder.py

Index: build/android/gyp/apkbuilder.py
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py
index 1410d190540ffd51ed25b6b06cd7415fe76b9335..c44173f0f941f21c179ebd68e4bdd4938206a17b 100755
--- a/build/android/gyp/apkbuilder.py
+++ b/build/android/gyp/apkbuilder.py
@@ -7,6 +7,7 @@
 """Adds the code parts to a resource APK."""
 
 import argparse
+import itertools
 import os
 import shutil
 import sys
@@ -15,9 +16,24 @@ import zipfile
 from util import build_utils
 
 
+# Taken from aapt's Package.cpp:
+_NO_COMPRESS_EXTENSIONS = ('.jpg', '.jpeg', '.png', '.gif', '.wav', '.mp2',
+                           '.mp3', '.ogg', '.aac', '.mpg', '.mpeg', '.mid',
+                           '.midi', '.smf', '.jet', '.rtttl', '.imy', '.xmf',
+                           '.mp4', '.m4a', '.m4v', '.3gp', '.3gpp', '.3g2',
+                           '.3gpp2', '.amr', '.awb', '.wma', '.wmv')
+
+
 def _ParseArgs(args):
   parser = argparse.ArgumentParser()
   build_utils.AddDepfileOption(parser)
+  parser.add_argument('--assets',
+                      help='GYP-list of files to add as assets in the form '
+                           '"srcPath:zipPath", where ":zipPath" is optional.',
+                      default='[]')
+  parser.add_argument('--uncompressed-assets',
+                      help='Same as --assets, except disables compression.',
+                      default='[]')
   parser.add_argument('--resource-apk',
                       help='An .ap_ file built using aapt',
                       required=True)
@@ -39,6 +55,9 @@ def _ParseArgs(args):
   if not options.android_abi and (options.native_libs_dir or
                                   options.create_placeholder_lib):
     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)
   return options
 
 
@@ -47,6 +66,47 @@ def _ListSubPaths(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]."""
+  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):
+  """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_type in (zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED):
+    for path in paths:
+      src_path, dest_path = _SplitAssetPath(path)
+
+      compress_type = zipfile.ZIP_DEFLATED
+      if disable_compression or (
+          os.path.splitext(src_path)[1] in _NO_COMPRESS_EXTENSIONS):
+        compress_type = zipfile.ZIP_STORED
+
+      if target_compress_type == compress_type:
+        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:
+          apk.write(src_path, apk_path, compress_type)
+
+
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
@@ -55,10 +115,17 @@ def main(args):
   if options.native_libs_dir:
     native_libs = _ListSubPaths(options.native_libs_dir)
 
-  input_paths = [options.resource_apk] + native_libs
+  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)
+    input_paths.append(src_path)
+    input_strings.append(dest_path)
+
   def on_stale_md5():
     tmp_apk = options.output_apk + '.tmp'
     try:
@@ -69,6 +136,8 @@ def main(args):
       # 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))
@@ -88,7 +157,7 @@ def main(args):
       on_stale_md5,
       options,
       input_paths=input_paths,
-      input_strings=[options.create_placeholder_lib, options.android_abi],
+      input_strings=input_strings,
       output_paths=[options.output_apk])