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

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 111 matching lines @@
       'files are handled differently based on the type of this target.')
 
   # android_resources options
   parser.add_option('--srcjar', help='Path to target\'s resources srcjar.')
   parser.add_option('--resources-zip', help='Path to target\'s resources zip.')
   parser.add_option('--r-text', help='Path to target\'s R.txt file.')
   parser.add_option('--package-name',
       help='Java package name for these resources.')
   parser.add_option('--android-manifest', help='Path to android manifest.')
 
+  # android_assets options
+  parser.add_option('--assets', help='List of asset\'s sources.')
+  parser.add_option('--disable-asset-compression', action='store_true',
+                    help='Whether to enable asset compression.')
+
   # java library options
   parser.add_option('--jar-path', help='Path to target\'s jar output.')
   parser.add_option('--supports-android', action='store_true',
       help='Whether this library supports running on the Android platform.')
   parser.add_option('--requires-android', action='store_true',
       help='Whether this library requires running on the Android platform.')
   parser.add_option('--bypass-platform-checks', action='store_true',
       help='Bypass checks for support/require Android platform.')
 
   # android library options
   parser.add_option('--dex-path', help='Path to target\'s dex output.')
 
   # native library options
   parser.add_option('--native-libs', help='List of top-level native libs.')
   parser.add_option('--readelf-path', help='Path to toolchain\'s readelf.')
 
   parser.add_option('--tested-apk-config',
       help='Path to the build config of the tested apk (for an instrumentation '
       'test apk).')
 
   options, args = parser.parse_args(argv)
 
   if args:
     parser.error('No positional arguments should be given.')
 
-
-  if not options.type in [
-      'java_library', 'android_resources', 'android_apk', 'deps_dex']:
+  required_options_map = {
+      'java_library': ['build_config', 'jar_path'],
+      'android_assets': ['build_config', 'assets'],
+      'android_resources': ['build_config', 'resources_zip'],
+      'android_apk': ['build_config', 'jar_path', 'dex_path', 'resources_zip'],
+      'deps_dex': ['build_config', 'dex_path']
+  }
+  required_options = required_options_map.get(options.type)
+  if not required_options:
     raise Exception('Unknown type: <%s>' % options.type)
 
-  required_options = ['build_config'] + {
-      'java_library': ['jar_path'],
-      'android_resources': ['resources_zip'],
-      'android_apk': ['jar_path', 'dex_path', 'resources_zip'],
-      'deps_dex': ['dex_path']
-    }[options.type]
-
   if options.native_libs:
     required_options.append('readelf_path')
 
   build_utils.CheckOptions(options, parser, required_options)
 
   if options.type == 'java_library':
     if options.supports_android and not options.dex_path:
       raise Exception('java_library that supports Android requires a dex path.')
 
     if options.requires_android and not options.supports_android:
       raise Exception(
           '--supports-android is required when using --requires-android')
 
   possible_deps_config_paths = build_utils.ParseGypList(
       options.possible_deps_configs)
 
-  allow_unknown_deps = (options.type == 'android_apk' or
-                        options.type == 'android_resources')
+  allow_unknown_deps = (options.type in
+                        ('android_apk', 'android_assets', 'android_resources'))
   unknown_deps = [
       c for c in possible_deps_config_paths if not os.path.exists(c)]
   if unknown_deps and not allow_unknown_deps:
     raise Exception('Unknown deps: ' + str(unknown_deps))
 
   direct_deps_config_paths = [
       c for c in possible_deps_config_paths if not c in unknown_deps]
 
   deps = Deps(direct_deps_config_paths)
   direct_library_deps = deps.Direct('java_library')
@@ skipping 58 matching lines @@
     # srcjar_deps). A resource's srcjar contains the R.java file for those
     # resources, and (like Android's default build system) we allow a library to
     # refer to the resources in any of its dependents.
     config['javac']['srcjars'] = [
         c['srcjar'] for c in direct_resources_deps if 'srcjar' in c]
 
   if options.type == 'android_apk':
     # Apks will get their resources srcjar explicitly passed to the java step.
     config['javac']['srcjars'] = []
 
+  if options.type == 'android_assets':
+    deps_info['assets'] = {
+        'paths': build_utils.ParseGypList(options.assets),
+        'enable_compression': not options.disable_asset_compression
+    }

[pkotwicz, 2015/10/24 03:46:03]

Nit: New line

[agrieve, 2015/10/25 17:32:09]

Done.

   if options.type == 'android_resources':
     deps_info['resources_zip'] = options.resources_zip
     if options.srcjar:
       deps_info['srcjar'] = options.srcjar
     if options.android_manifest:
       manifest = AndroidManifest(options.android_manifest)
       deps_info['package_name'] = manifest.GetPackageName()
     if options.package_name:
       deps_info['package_name'] = options.package_name
     if options.r_text:
@@ skipping 76 matching lines @@
       if not library_paths:
         prev_config = build_utils.ReadJson(options.build_config)
         java_libraries_list_holder[0] = (
             prev_config['native']['java_libraries_list'])
         library_paths.extend(prev_config['native']['libraries'])
 
     config['native'] = {
       'libraries': library_paths,
       'java_libraries_list': java_libraries_list_holder[0],
     }
+    all_assets = deps.All('android_assets')
+    config['merged_assets'] = [a['assets'] for a in all_assets if 'assets' in a]

[pkotwicz, 2015/10/24 03:46:03]

I think that you can make things slightly clearer by having:
config['merged_assets']['compress'] and config['merged_assets']['no_compress']

This should decrease the number of places which need to pass the path the to the
config file around which I think will make things clearer

[agrieve, 2015/10/25 17:32:09]

I like that this would make for a shallower tree, but I think for now I'd like
to keep the order intact in case we need to implement asset merging. 

Asset merging could be implemented in this merge step, so it's a weak stance,
but I don't think it's a big enough improvement to change in the other direction
either.

 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         deps.AllConfigPaths() + build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))