Use more generic approach to pack java resources into final APK.

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 13 matching lines @@
                            '.3gpp2', '.amr', '.awb', '.wma', '.wmv', '.webm')
 
 
 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('--java-resources',
+                      help='GYP-list of java_resources JARs to include.',
+                      default='[]')
   parser.add_argument('--write-asset-list',
                       action='store_true',
                       help='Whether to create an assets/assets_list file.')
   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)
   parser.add_argument('--output-apk',
@@ skipping 12 matching lines @@
                            'android-abi. Can be specified multiple times.',
                       default=[])
   parser.add_argument('--android-abi',
                       help='Android architecture to use for native libraries')
   parser.add_argument('--secondary-android-abi',
                       help='The secondary Android architecture to use for'
                            'secondary native libraries')
   parser.add_argument('--native-lib-placeholders',
                       help='GYP-list of native library placeholders to add.',
                       default='[]')
-  parser.add_argument('--emma-device-jar',
-                      help='Path to emma_device.jar to include.')
   parser.add_argument('--uncompress-shared-libraries',
                       action='store_true',
                       help='Uncompress shared libraries')
   options = parser.parse_args(args)
   options.assets = build_utils.ParseGypList(options.assets)
   options.uncompressed_assets = build_utils.ParseGypList(
       options.uncompressed_assets)
+  options.java_resources = build_utils.ParseGypList(options.java_resources)
   options.native_lib_placeholders = build_utils.ParseGypList(
       options.native_lib_placeholders)
   all_libs = []
   for gyp_list in options.native_libs:
     all_libs.extend(build_utils.ParseGypList(gyp_list))
   options.native_libs = all_libs
   secondary_libs = []
   for gyp_list in options.secondary_native_libs:
     secondary_libs.extend(build_utils.ParseGypList(gyp_list))
   options.secondary_native_libs = secondary_libs
@@ skipping 103 matching lines @@
 
   secondary_native_libs = []
   if options.secondary_native_libs:
     secondary_native_libs = sorted(options.secondary_native_libs)
     input_paths += secondary_native_libs
     depfile_deps += secondary_native_libs
 
   if options.dex_file:
     input_paths.append(options.dex_file)
 
-  if options.emma_device_jar:
-    input_paths.append(options.emma_device_jar)
-
   input_strings = [options.android_abi,
                    options.native_lib_placeholders,
                    options.uncompress_shared_libraries]
 
   if options.secondary_android_abi:
     input_strings.append(options.secondary_android_abi)
 
+  if options.java_resources:
+    input_paths.extend(options.java_resources)
+
   _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:
@@ skipping 49 matching lines @@
         for name in sorted(options.native_lib_placeholders):
           # Empty libs files are ignored by md5check, but rezip requires them
           # to be empty in order to identify them as placeholders.
           apk_path = 'lib/%s/%s' % (options.android_abi, name)
           build_utils.AddToZipHermetic(out_apk, apk_path, data='')
 
         # 5. Resources
         for info in resource_infos[1:]:
           copy_resource(info)
 
-        # 6. Java resources. Used only when coverage is enabled, so order
-        # doesn't matter).
-        if options.emma_device_jar:
-          # Add EMMA Java resources to APK.
-          with zipfile.ZipFile(options.emma_device_jar, 'r') as emma_device_jar:
-            for apk_path in emma_device_jar.namelist():
+        # 6. Java resources that should be accessible via
+        # Class.getResourceAsStream(), in particular parts of Emma jar.
+        # Prebuilt jars may contain class files which we shouldn't include.
+        for java_resource in options.java_resources:
+          with zipfile.ZipFile(java_resource, 'r') as java_resource_jar:
+            for apk_path in java_resource_jar.namelist():
               apk_path_lower = apk_path.lower()
+
               if apk_path_lower.startswith('meta-inf/'):
                 continue
-
               if apk_path_lower.endswith('/'):
                 continue
-
               if apk_path_lower.endswith('.class'):
                 continue
 
-              build_utils.AddToZipHermetic(out_apk, apk_path,
-                                           data=emma_device_jar.read(apk_path))
+              build_utils.AddToZipHermetic(
+                  out_apk, apk_path, data=java_resource_jar.read(apk_path))
 
       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],
       depfile_deps=depfile_deps)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])