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

build/config/android/internal_rules.gni

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 224 matching lines @@
 template("write_build_config") {
   set_sources_assignment_filter([])
 
   assert(defined(invoker.type))
   assert(defined(invoker.build_config))
 
   type = invoker.type
   build_config = invoker.build_config
 
   assert(type == "android_apk" || type == "java_library" ||
-         type == "android_resources" || type == "deps_dex")
+         type == "android_resources" || type == "deps_dex" ||
+         type == "android_assets")
 
   action(target_name) {
     deps = []
     forward_variables_from(invoker,
                            [
                              "deps",
                              "testonly",
                              "visibility",
                            ])
 
@@ skipping 20 matching lines @@
       type,
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--possible-deps-configs=$rebase_possible_deps_configs",
       "--build-config",
       rebase_path(build_config, root_build_dir),
     ]
 
     is_java_library = type == "java_library"
     is_apk = type == "android_apk"
+    is_android_assets = type == "android_assets"
     is_android_resources = type == "android_resources"
     is_deps_dex = type == "deps_dex"
 
-    supports_android = is_apk || is_android_resources || is_deps_dex ||
-                       (is_java_library && defined(invoker.supports_android) &&
-                        invoker.supports_android)
-    requires_android = is_apk || is_android_resources || is_deps_dex ||
-                       (is_java_library && defined(invoker.requires_android) &&
-                        invoker.requires_android)
+    supports_android =
+        is_apk || is_android_assets || is_android_resources || is_deps_dex ||
+        (is_java_library && defined(invoker.supports_android) &&
+         invoker.supports_android)
+    requires_android =
+        is_apk || is_android_assets || is_android_resources || is_deps_dex ||
+        (is_java_library && defined(invoker.requires_android) &&
+         invoker.requires_android)
 
     assert(!requires_android || supports_android,
            "requires_android requires" + " supports_android")
 
     # Mark these variables as used.
     assert(is_java_library || true)
     assert(is_apk || true)
     assert(is_android_resources || true)
     assert(is_deps_dex || true)
 
@@ skipping 27 matching lines @@
           get_label_info(invoker.apk_under_test, "target_gen_dir")
       apk_under_test_name = get_label_info(invoker.apk_under_test, "name")
       apk_under_test_config =
           "$apk_under_test_gen_dir/$apk_under_test_name.build_config"
       args += [
         "--tested-apk-config",
         rebase_path(apk_under_test_config, root_build_dir),
       ]
     }
 
+    if (is_android_assets) {
+      inputs += invoker.assets
+      _rebased_assets = rebase_path(invoker.assets, root_build_dir)
+      args += [ "--assets=$_rebased_assets" ]
+      if (defined(invoker.enable_compression) && !invoker.enable_compression) {
+        args += [ "--disable-asset-compression" ]
+      }
+    }
+
     if (is_android_resources || is_apk) {
       assert(defined(invoker.resources_zip))
       args += [
         "--resources-zip",
         rebase_path(invoker.resources_zip, root_build_dir),
       ]
       if (defined(invoker.android_manifest)) {
         inputs += [ invoker.android_manifest ]
         args += [
           "--android-manifest",
@@ skipping 121 matching lines @@
     public_deps = [
       ":${target_name}__ijar",
       ":$_output_jar_target",
     ]
   }
 }
 
 # Creates an unsigned .apk.
 #
 # Variables
+#   assets_build_config: Path to android_apk .build_config containing merged
+#       asset information.
 #   deps: Specifies the dependencies of this target.
 #   dex_path: Path to classes.dex file to include (optional).
 #   resource_packaged_apk_path: Path to .ap_ to use.
 #   output_apk_path: Output path for the generated .apk.
 #   native_libs_dir: Directory containing native libraries.
 #   create_placeholder_lib: Whether to add a dummy lib to the apk.
 template("package_apk") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
@@ skipping 25 matching lines @@
     _rebased_resource_packaged_apk_path =
         rebase_path(invoker.resource_packaged_apk_path, root_build_dir)
     _rebased_packaged_apk_path =
         rebase_path(invoker.output_apk_path, root_build_dir)
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--resource-apk=$_rebased_resource_packaged_apk_path",
       "--output-apk=$_rebased_packaged_apk_path",
     ]
+    if (defined(invoker.assets_build_config)) {
+      inputs += [ invoker.assets_build_config ]
+      _rebased_build_config =
+          rebase_path(invoker.assets_build_config, root_build_dir)
+      args += [ "--assets-build-config=$_rebased_build_config" ]
+    }
     if (defined(invoker.dex_path)) {
       _rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
       args += [ "--dex-file=$_rebased_dex_path" ]
     }
     if (defined(invoker.native_libs_dir) || _create_placeholder_lib) {
       args += [ "--android-abi=$android_app_abi" ]
     }
     if (defined(invoker.native_libs_dir)) {
       _rebased_native_libs_dir =
           rebase_path(invoker.native_libs_dir, root_build_dir)
@@ skipping 91 matching lines @@
 
   _deps = []
   if (defined(invoker.deps)) {
     _deps = invoker.deps
   }
   _incremental_deps = []
   if (defined(invoker.incremental_deps)) {
     _incremental_deps = invoker.incremental_deps
   }
 
+  # TODO(agrieve): Remove support for asset_location in favor of using
+  # android_asset() everywhere (http://crbug.com/547162).
   if (defined(invoker.asset_location)) {
     _asset_location = invoker.asset_location
     assert(_asset_location != "")  # Mark as used.
   }
 
   _version_code = invoker.version_code
   _version_name = invoker.version_name
   assert(_version_code != -1)  # Mark as used.
   assert(_version_name != "")  # Mark as used.
 
@@ skipping 83 matching lines @@
         foreach(_density, _split_densities) {
           outputs += [ "${invoker.resource_packaged_apk_path}_${_density}" ]
         }
       }
       if (_split_languages != []) {
         args += [ "--language-splits=$_split_languages" ]
         foreach(_language, _split_languages) {
           outputs += [ "${invoker.resource_packaged_apk_path}_${_language}" ]
         }
       }
       if (defined(invoker.extensions_to_not_compress)) {

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

This parameter will also be removed when asset_location is removed?

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

It still applies to files in resources

         args += [
           "--no-compress",
           invoker.extensions_to_not_compress,
         ]
       }
     }
   }
 
   _package_resources_target_name = "${target_name}__package_resources"
   package_resources_helper(_package_resources_target_name) {
@@ skipping 42 matching lines @@
   package_resources_helper(_incremental_package_resources_target_name) {
     forward_variables_from(invoker, [ "extensions_to_not_compress" ])
     deps =
         _incremental_deps + [ ":$_generate_incremental_manifest_target_name" ]
     android_manifest = _incremental_android_manifest
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   package_target = "${target_name}__package"
   package_apk(package_target) {
-    forward_variables_from(invoker, [ "native_libs_dir" ])
+    forward_variables_from(invoker,
+                           [
+                             "assets_build_config",
+                             "native_libs_dir",
+                           ])
     deps = _deps + [ ":${_package_resources_target_name}" ]
 
     if (defined(_dex_path)) {
       dex_path = _dex_path
     }
 
     output_apk_path = _packaged_apk_path
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _incremental_package_target = "${target_name}_incremental__package"
   package_apk(_incremental_package_target) {
+    forward_variables_from(invoker, [ "assets_build_config" ])
     _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
     deps = _incremental_deps + [
              ":${_incremental_package_resources_target_name}",
              _dex_target,
            ]
 
     if (defined(_dex_path)) {
       dex_path =
           get_label_info(_dex_target, "target_gen_dir") + "/bootstrap.dex"
     }
@@ skipping 862 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }