Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: build/java.gypi

Issue 377353003: Start using proguard.jar directly instead of proguard.sh (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/instrumentation/test_jar.py ('k') | build/java_prebuilt.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 966d395386d351530fcbd015f326a9d91cbb7866..6f860300ad7f967fc2d3b5fc3191f9490a3d720c 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)',
« no previous file with comments | « build/android/pylib/instrumentation/test_jar.py ('k') | build/java_prebuilt.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698