Use more generic approach to pack java resources into final 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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 160 matching lines @@
     assert(is_deps_dex || true)
     assert(is_group || true)
 
     if (is_java || is_apk) {
       args += [
         "--jar-path",
         rebase_path(invoker.jar_path, root_build_dir),
       ]
     }
 
+    if (is_java && defined(invoker.java_resources_jar)) {
+      args += [
+        "--java-resources-jar-path",
+        rebase_path(invoker.java_resources_jar, root_build_dir),
+      ]
+    }
     if (is_apk || is_deps_dex || (is_java && supports_android)) {
       args += [
         "--dex-path",
         rebase_path(invoker.dex_path, root_build_dir),
       ]
     }
     if (supports_android) {
       args += [ "--supports-android" ]
     }
     if (requires_android) {
@@ skipping 1141 matching lines @@
         "--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=@FileArg($_rebased_build_config:assets)",
           "--uncompressed-assets=@FileArg($_rebased_build_config:uncompressed_assets)",
         ]
+
+        # TODO(mlopatkin) We are relying on the fact that assets_build_config is
+        # an APK build_config.
+        args += [ "--java-resources=@FileArg($_rebased_build_config:java_resources_jars)" ]
       }
       if (defined(invoker.write_asset_list) && invoker.write_asset_list) {
         args += [ "--write-asset-list" ]
       }
       if (defined(invoker.dex_path)) {
         _rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
         args += [ "--dex-file=$_rebased_dex_path" ]
       }
       if (invoker.native_libs != [] || defined(invoker.native_libs_filearg) ||
           _native_lib_placeholders != []) {
@@ skipping 21 matching lines @@
                  invoker.secondary_native_libs != []) {
         assert(defined(android_app_secondary_abi))
         inputs += invoker.secondary_native_libs
         _secondary_native_libs = rebase_path(invoker.secondary_native_libs)
         args += [
           "--secondary-native-libs=$_secondary_native_libs",
           "--secondary-android-abi=$android_app_secondary_abi",
         ]
       }
 
-      if (defined(invoker.emma_instrument) && invoker.emma_instrument) {
-        _emma_device_jar = "$android_sdk_root/tools/lib/emma_device.jar"
-        _rebased_emma_device_jar = rebase_path(_emma_device_jar, root_build_dir)
-        args += [ "--emma-device-jar=$_rebased_emma_device_jar" ]
-      }
-
       if (defined(invoker.uncompress_shared_libraries) &&
           invoker.uncompress_shared_libraries) {
         args += [ "--uncompress-shared-libraries" ]
       }
     }
   }
 
   # Signs & zipaligns an apk.
   #
   # Variables
@@ skipping 291 matching lines @@
           _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,
                              [
                                "assets_build_config",
-                               "emma_instrument",
                                "native_lib_placeholders",
                                "native_libs_filearg",
                                "secondary_abi_native_libs_filearg",
                                "secondary_native_libs",
                                "uncompress_shared_libraries",
                                "write_asset_list",
                              ])
       deps = _deps + [ ":${_package_resources_target_name}" ]
       native_libs = _native_libs + _native_libs_even_when_incremental
 
       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",
-                               "emma_instrument",
                                "secondary_native_libs",
                                "uncompress_shared_libraries",
                              ])
       _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
       deps = _incremental_deps + [
                ":${_incremental_package_resources_target_name}",
                _dex_target,
              ]
 
       if (defined(_dex_path)) {
@@ skipping 145 matching lines @@
           defined(invoker.requires_android) && invoker.requires_android
 
       if (defined(invoker.deps)) {
         possible_config_deps = _deps
       }
       build_config = _build_config
       jar_path = _jar_path
       if (_supports_android) {
         dex_path = _dex_path
       }
+      if (defined(invoker.include_java_resources) &&
+          invoker.include_java_resources) {
+        # Use original jar_path because _jar_path points to a library without
+        # resources.
+        java_resources_jar = invoker.jar_path
+      }
     }
 
     process_java_prebuilt(_process_jar_target_name) {
       forward_variables_from(invoker,
                              [
                                "jar_excluded_patterns",
                                "proguard_preprocess",
                                "proguard_preprocess_config",
                                "strip_resource_classes",
                              ])
@@ skipping 941 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }