From 6593b277eafa971ae5e05a5200e6757e71684628 Mon Sep 17 00:00:00 2001 From: "cjhopman@chromium.org" Date: Sat, 18 May 2013 02:33:37 +0000 Subject: [Android] Fix proguard Gyp supports only very limited ways of changing behavior based upon CONFIGURATION_NAME. Particularly, it does not support the way that was supposed to enable/disable use of proguard. Instead of trying to switch behavior in gyp, instead pass CONFIGURATION_NAME, proguard_enabled, and proguard_enabled_dex_input_path to dex.py and switch the behavior there. This also extracts the dex actions into build/android/dex_action.gypi and uses that for the actions in both build/java.gypi and build/java_apk.gypi. BUG=240837 Review URL: https://chromiumcodereview.appspot.com/15231006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200958 0039d316-1c4b-4281-b951-d872f2087c98 --- build/java.gypi | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'build/java.gypi') diff --git a/build/java.gypi b/build/java.gypi index 8256486..3fd6429 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -282,27 +282,11 @@ }, { 'action_name': 'dex_<(_target_name)', - 'message': 'Dexing <(_target_name) jar', - 'inputs': [ - '<(DEPTH)/build/android/gyp/util/build_utils.py', - '<(DEPTH)/build/android/gyp/util/md5_check.py', - '<(DEPTH)/build/android/gyp/dex.py', - '<(jar_path)', - ], - 'outputs': [ - '<(dex_path)', - ], - 'action': [ - 'python', '<(DEPTH)/build/android/gyp/dex.py', - '--dex-path=<(dex_path)', - '--android-sdk-root=<(android_sdk_root)', - - # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja. - '--ignore=>!(echo \'>(_inputs)\' | md5sum)', - - '<(jar_path)', - ] + 'variables': { + 'dex_input_paths': [ '<(jar_path)' ], + 'output_path': '<(dex_path)', + }, + 'includes': [ 'android/dex_action.gypi' ], }, - ], } -- cgit v1.1