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

Unified Diff: build/android/gyp/main_dex_list.py

Issue 2840533003: [android] Make main_dex_list.py use the same proguard as everything else. (Closed)
Patch Set: remove unused constant Created 3 years, 8 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 | « no previous file | build/android/pylib/constants/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/main_dex_list.py
diff --git a/build/android/gyp/main_dex_list.py b/build/android/gyp/main_dex_list.py
index 10a9961c1e95cc268f582225d1d81a0c829605ac..e18422e958aeff7b2d1ac2b3f04e9ea9e89ed46b 100755
--- a/build/android/gyp/main_dex_list.py
+++ b/build/android/gyp/main_dex_list.py
@@ -40,6 +40,9 @@ def main(args):
parser.add_argument('--inputs',
help='JARs for which a main dex list should be '
'generated.')
+ parser.add_argument('--proguard-path', required=True,
+ help='Path to the proguard executable.')
+
parser.add_argument('paths', nargs='*', default=[],
help='JARs for which a main dex list should be '
'generated.')
@@ -64,7 +67,7 @@ def main(args):
os.path.join(args.android_sdk_tools, 'mainDexClasses.rules'))
proguard_cmd = [
- constants.PROGUARD_SCRIPT_PATH,
+ 'java', '-jar', args.proguard_path,
'-forceprocessing',
'-dontwarn', '-dontoptimize', '-dontobfuscate', '-dontpreverify',
'-libraryjars', shrinked_android_jar,
« no previous file with comments | « no previous file | build/android/pylib/constants/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698