Add support for proguard preprocessing.

build/java.gypi

 # Copyright (c) 2012 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 52 matching lines @@
     'generated_R_dirs': [],
     'has_java_resources%': 0,
     'java_strings_grd%': '',
     'res_extra_dirs': [],
     'res_extra_files': [],
     'res_v14_verify_only%': 0,
     'resource_input_paths': ['>@(res_extra_files)'],
     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
     'classes_dir': '<(intermediate_dir)/classes',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
+    'proguard_config%': '',
+    'proguard_preprocess%': '0',
+    'variables': {
+      'variables': {
+        'proguard_preprocess%': 0,
+      },
+      'conditions': [
+        ['proguard_preprocess == 1', {
+          'javac_jar_path': '<(intermediate_dir)/<(_target_name).pre.jar'
+        }, {
+          'javac_jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)'
+        }],
+      ],
+    },
+    'javac_jar_path': '<(javac_jar_path)',
   },
   # This all_dependent_settings is used for java targets only. This will add the
   # jar path to the classpath of dependent java targets.
   'all_dependent_settings': {
     'variables': {
       'input_jars_paths': ['<(jar_path)'],
       'library_dexed_jars_paths': ['<(dex_path)'],
     },
   },
   'conditions': [
@@ skipping 128 matching lines @@
           'action': [
             'python', '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py',
             '--res-dir=<(res_dir)',
             '--res-v14-compatibility-dir=<(res_v14_compatibility_dir)',
             '--stamp', '<(res_v14_compatibility_stamp)',
             '<@(res_v14_additional_options)',
           ]
         },
       ],
     }],
+    ['proguard_preprocess == 1', {
+      'actions': [
+        {
+          'action_name': 'proguard_<(_target_name)',
+          'message': 'Proguard preprocessing <(_target_name) jar',
+          'inputs': [
+            '<(DEPTH)/build/android/gyp/util/build_utils.py',
+            '<(DEPTH)/build/android/gyp/proguard.py',
+            '<(javac_jar_path)',
+            '<(proguard_config)',
+          ],
+          'outputs': [
+            '<(jar_path)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/gyp/proguard.py',
+            '--proguard-path=<(android_sdk_root)/tools/proguard/bin/proguard.sh',

[nyquist, 2013/08/14 22:19:10]

Add this to inputs? Or do we consider that never to be necessary for tools part
of the Android SDK, since other things are bound to change during SDK rolls?

[nyquist, 2013/08/14 23:24:12]

Done.

+            '--input-path=<(javac_jar_path)',
+            '--output-path=<(jar_path)',
+            '--proguard-config=<(proguard_config)',
+            '--classpath=<(android_sdk_jar) >(input_jars_paths)',
+
+            # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
+            '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
+          ]
+        },
+      ],
+    }],
   ],
   'actions': [
     {
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling <(_target_name) java sources',
       'variables': {
         'all_src_dirs': [
           '>(java_in_dir)/src',
           '>@(additional_src_dirs)',
           '>@(generated_src_dirs)',
@@ skipping 25 matching lines @@
     {
       'action_name': 'jar_<(_target_name)',
       'message': 'Creating <(_target_name) jar',
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/util/md5_check.py',
         '<(DEPTH)/build/android/gyp/jar.py',
         '<(compile_stamp)',
       ],
       'outputs': [
-        '<(jar_path)',
+        '<(javac_jar_path)',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/jar.py',
         '--classes-dir=<(classes_dir)',
-        '--jar-path=<(jar_path)',
+        '--jar-path=<(javac_jar_path)',
         '--excluded-classes=<(jar_excluded_classes)',
 
         # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
     {
       'action_name': 'jar_toc_<(_target_name)',
       'message': 'Creating <(_target_name) jar.TOC',
       'inputs': [
@@ skipping 17 matching lines @@
     {
       'action_name': 'dex_<(_target_name)',
       'variables': {
         'dex_input_paths': [ '<(jar_path)' ],
         'output_path': '<(dex_path)',
       },
       'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }