Refactor proguard scripts

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 optparse
 import os
 import sys
 
 from util import build_utils
+from util import proguard_util
+
 
 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')
@@ skipping 36 matching lines @@
       'configuration_name',
       'obfuscated_jar_path',
       )
 
   if options.testapp:
     required_options += (
         'test_jar_path',
         )
 
   build_utils.CheckOptions(options, parser, required=required_options)
+  return options, args
 
-  return options, args
+
+def DoProguard(options):
+  proguard = proguard_util.ProguardCmdBuilder(options.proguard_jar_path)
+  proguard.outjar(options.obfuscated_jar_path)
+
+  library_classpath = [options.android_sdk_jar]
+  input_jars = build_utils.ParseGypList(options.input_jars_paths)
+
+  exclude_paths = []
+  configs = build_utils.ParseGypList(options.proguard_configs)
+  if (options.tested_apk_obfuscated_jar_path and
+      options.tested_apk_obfuscated_jar_path != '/'):

[newt (away), 2015/04/28 04:22:14]

why would the path be "/"?

[cjhopman, 2015/05/02 00:41:44]

Done.

+    # configs should only contain the process_resources.py generated config.
+    assert len(configs) == 1, (
+        'test apks should not have custom proguard configs: ' + str(configs))
+    tested_jar_info = build_utils.ReadJson(
+        options.tested_apk_obfuscated_jar_path + '.info')
+    exclude_paths = tested_jar_info['inputs']
+    configs = tested_jar_info['configs']
+
+    proguard.testoptions(True)

[newt (away), 2015/04/28 04:22:14]

testoptions() sounds like it's going to take a list of options, but in fact it
takes a boolean. How about calling it "is_test()" or something like that?

[cjhopman, 2015/05/02 00:41:44]

Done.

+    proguard.mapping(options.tested_apk_obfuscated_jar_path + '.mapping')
+    library_classpath.append(options.tested_apk_obfuscated_jar_path)
+
+  proguard.libraryjars(library_classpath)
+  proguard_injars = [p for p in input_jars if p not in exclude_paths]
+  proguard.injars(proguard_injars)
+  proguard.configs(configs)
+
+  proguard.CheckOutput()
+
+  this_info = {
+    'inputs': proguard_injars,
+    'configs': configs
+  }
+
+  build_utils.WriteJson(
+      this_info, options.obfuscated_jar_path + '.info')
 
 
 def main(argv):
   options, _ = ParseArgs(argv)
 
-  library_classpath = [options.android_sdk_jar]
   input_jars = build_utils.ParseGypList(options.input_jars_paths)
 
-  dependency_class_filters = [
-      '*R.class', '*R$*.class', '*Manifest.class', '*BuildConfig.class']
-
   if options.testapp:
+    dependency_class_filters = [
+        '*R.class', '*R$*.class', '*Manifest.class', '*BuildConfig.class']
     build_utils.MergeZips(
         options.test_jar_path, input_jars, dependency_class_filters)
 
   if options.configuration_name == 'Release' and options.proguard_enabled:
-    proguard_cmd = [
-        'java', '-jar', options.proguard_jar_path,
-        '-forceprocessing',
-        '-libraryjars', ':'.join(library_classpath),
-        '-dump', options.obfuscated_jar_path + '.dump',
-        '-printseeds', options.obfuscated_jar_path + '.seeds',
-        '-printusage', options.obfuscated_jar_path + '.usage',
-        '-printmapping', options.obfuscated_jar_path + '.mapping',
-        ]
-
-    exclude_paths = []
-    configs = build_utils.ParseGypList(options.proguard_configs)
-    if (options.tested_apk_obfuscated_jar_path and
-        options.tested_apk_obfuscated_jar_path != '/'):
-      # configs should only contain the process_resources.py generated config.
-      assert len(configs) == 1, (
-          'test apks should not have custom proguard configs: ' + str(configs))
-      tested_jar_info = build_utils.ReadJson(
-          options.tested_apk_obfuscated_jar_path + '.info')
-      exclude_paths = tested_jar_info['inputs']
-      configs = tested_jar_info['configs']
-      proguard_cmd += [
-          '-dontobfuscate',
-          '-dontoptimize',
-          '-dontshrink',
-          '-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)]
-
-    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')
+    DoProguard(options)
   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:]))