diff options
| author | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-11 01:49:41 +0000 |
|---|---|---|
| committer | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-11 01:49:41 +0000 |
| commit | ed6659cf57055ea8bea542b672938d77a27fe712 (patch) | |
| tree | 337843d3dee3c88889253876027ffbee219c2a7a /build/java.gypi | |
| parent | 741314c6c88d372e2bedbc7f9b6e0c65e9669262 (diff) | |
| download | chromium_src-ed6659cf57055ea8bea542b672938d77a27fe712.zip chromium_src-ed6659cf57055ea8bea542b672938d77a27fe712.tar.gz chromium_src-ed6659cf57055ea8bea542b672938d77a27fe712.tar.bz2 | |
Start using proguard.jar directly instead of proguard.sh
android_tools/sdk/tools/proguard/bin/proguard.sh was removed with SDK tools
update. https://gerrit.chromium.org/gerrit/#/c/70802/ updates SDK tools
and we want to roll to start using it.
BUG=393019
Review URL: https://codereview.chromium.org/377353003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/java.gypi b/build/java.gypi index 966d395..6f86030 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -193,7 +193,7 @@ 'action_name': 'proguard_<(_target_name)', 'message': 'Proguard preprocessing <(_target_name) jar', 'inputs': [ - '<(android_sdk_root)/tools/proguard/bin/proguard.sh', + '<(android_sdk_root)/tools/proguard/lib/proguard.jar', '<(DEPTH)/build/android/gyp/util/build_utils.py', '<(DEPTH)/build/android/gyp/proguard.py', '<(javac_jar_path)', @@ -204,7 +204,7 @@ ], 'action': [ 'python', '<(DEPTH)/build/android/gyp/proguard.py', - '--proguard-path=<(android_sdk_root)/tools/proguard/bin/proguard.sh', + '--proguard-path=<(android_sdk_root)/tools/proguard/lib/proguard.jar', '--input-path=<(javac_jar_path)', '--output-path=<(jar_path)', '--proguard-config=<(proguard_config)', |