Make test apks only dex files not in tested apk (proguard version)

build/android/gyp/apk_obfuscate.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.
 
 """Generates the obfuscated jar and test jar for an apk.
 
 If proguard is not enabled or 'Release' is not in the configuration name,
 obfuscation will be a no-op.
 """
 
 import fnmatch
 import optparse
 import os
 import sys
 import zipfile
 
 from util import build_utils
 
 def ParseArgs(argv):
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk', help='path to the Android SDK folder')
   parser.add_option('--android-sdk-tools',
                     help='path to the Android SDK build tools folder')
   parser.add_option('--android-sdk-jar',
                     help='path to Android SDK\'s android.jar')
   parser.add_option('--proguard-jar-path',
                     help='Path to proguard.jar in the sdk')
-
   parser.add_option('--input-jars-paths',
                     help='Path to jars to include in obfuscated jar')
 
-  parser.add_option('--proguard-config-files',
+  parser.add_option('--proguard-configs',
                     help='Paths to proguard config files')
 
   parser.add_option('--configuration-name',
                     help='Gyp configuration name (i.e. Debug, Release)')
   parser.add_option('--proguard-enabled', action='store_true',
                     help='Set if proguard is enabled for this target.')
 
   parser.add_option('--obfuscated-jar-path',
                     help='Output path for obfuscated jar.')
 
   parser.add_option('--testapp', action='store_true',
                     help='Set this if building an instrumentation test apk')
+  parser.add_option('--tested-apk-obfuscated-jar-path',
+                    help='Path to obfusctated jar of the tested apk')
   parser.add_option('--test-jar-path',
                     help='Output path for jar containing all the test apk\'s '
                     'code.')
 
   parser.add_option('--stamp', help='File to touch on success')
 
   (options, args) = parser.parse_args(argv)
 
   if args:
     parser.error('No positional arguments should be given. ' + str(args))
 
   # Check that required options have been provided.
   required_options = (
       'android_sdk',
       'android_sdk_tools',
       'android_sdk_jar',
       'proguard_jar_path',
       'input_jars_paths',
       'configuration_name',
       'obfuscated_jar_path',
       )
+  if options.testapp:
+    required_options += (
+        'tested_apk_obfuscated_jar_path',
+        'test_jar_path',
+        )
   build_utils.CheckOptions(options, parser, required=required_options)
 
   return options, args
 
 
 def main(argv):
   options, _ = ParseArgs(argv)
 
   library_classpath = [options.android_sdk_jar]
-  javac_custom_classpath = build_utils.ParseGypList(options.input_jars_paths)
+  input_jars = build_utils.ParseGypList(options.input_jars_paths)
 
   dependency_class_filters = [
       '*R.class', '*R$*.class', '*Manifest.class', '*BuildConfig.class']
 
   def DependencyClassFilter(name):
     for name_filter in dependency_class_filters:
       if fnmatch.fnmatch(name, name_filter):
         return False
     return True
 
   if options.testapp:
     with zipfile.ZipFile(options.test_jar_path, 'w') as test_jar:
-      for jar in build_utils.ParseGypList(options.input_jars_paths):
+      for jar in input_jars:
         with zipfile.ZipFile(jar, 'r') as jar_zip:
           for name in filter(DependencyClassFilter, jar_zip.namelist()):
             with jar_zip.open(name) as zip_entry:
               test_jar.writestr(name, zip_entry.read())
 
-  if options.configuration_name == 'Release' and options.proguard_enabled:
-    proguard_project_classpath = javac_custom_classpath
-
+  if 'Release' in options.configuration_name and options.proguard_enabled:

[Yaron, 2014/06/11 00:45:26]

needs rebase :)

[cjhopman, 2014/06/12 20:36:44]

Done.

     proguard_cmd = [
         'java', '-jar', options.proguard_jar_path,
         '-forceprocessing',
-        '-injars', ':'.join(proguard_project_classpath),
         '-libraryjars', ':'.join(library_classpath),
-        '-outjars', options.obfuscated_jar_path,
         '-dump', options.obfuscated_jar_path + '.dump',
         '-printseeds', options.obfuscated_jar_path + '.seeds',
         '-printusage', options.obfuscated_jar_path + '.usage',
         '-printmapping', options.obfuscated_jar_path + '.mapping',
         ]
 
-    for proguard_file in build_utils.ParseGypList(
-        options.proguard_config_files):
-      proguard_cmd += ['-include', proguard_file]
+    exclude_paths = []
+    configs = build_utils.ParseGypList(options.proguard_configs)
+    if (options.tested_apk_obfuscated_jar_path and
+        options.tested_apk_obfuscated_jar_path != '/'):
+      tested_jar_info = build_utils.ReadJson(
+          options.tested_apk_obfuscated_jar_path + '.info')
+      exclude_paths = tested_jar_info['inputs']
+      # configs should only contain the process_resources.py generated config.
+      assert len(configs) == 1, (

[Yaron, 2014/06/11 00:45:26]

nit: move to the top of the block.

[cjhopman, 2014/06/12 20:36:44]

Done.

+          'test apks should not have custom proguard configs: ' + str(configs))
+      configs = tested_jar_info['configs']
+      proguard_cmd += [
+          '-dontobfuscate',
+          '-dontoptimize',
+          '-dontskipnonpubliclibraryclassmembers',
+          '-libraryjars', options.tested_apk_obfuscated_jar_path,
+          '-applymapping', options.tested_apk_obfuscated_jar_path + '.mapping',
+          ]
+
+    proguard_injars = [p for p in input_jars if p not in exclude_paths]
+    proguard_cmd += [ '-injars', ':'.join(proguard_injars), ]

[Yaron, 2014/06/11 00:45:26]

nit: no trailing "," or leading " "

[cjhopman, 2014/06/12 20:36:44]

Done.

+
+    for config_file in configs:
+      proguard_cmd += ['-include', config_file]
+
+    # The output jar must be specified after inputs.
+    proguard_cmd += ['-outjars', options.obfuscated_jar_path]
 
     build_utils.CheckOutput(proguard_cmd)
+
+    this_info = {
+      'inputs': proguard_injars,
+      'configs': configs
+    }
+
+    build_utils.WriteJson(
+        this_info, options.obfuscated_jar_path + '.info')
   else:
     output_files = [
         options.obfuscated_jar_path,
+        options.obfuscated_jar_path + '.info',
         options.obfuscated_jar_path + '.dump',
         options.obfuscated_jar_path + '.seeds',
         options.obfuscated_jar_path + '.usage',
         options.obfuscated_jar_path + '.mapping']
     for f in output_files:
       if os.path.exists(f):
         os.remove(f)
       build_utils.Touch(f)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))