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

Side by Side Diff: build/android/gyp/proguard.py

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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_jar.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # Copyright 2013 The Chromium Authors. All rights reserved. 3 # Copyright 2013 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 import optparse 7 import optparse
8 import os 8 import os
9 import sys 9 import sys
10 10
11 from util import build_utils 11 from util import build_utils
12 12
13 def DoProguard(options): 13 def DoProguard(options):
14 injars = options.input_path 14 injars = options.input_path
15 outjars = options.output_path 15 outjars = options.output_path
16 classpath = build_utils.ParseGypList(options.classpath) 16 classpath = build_utils.ParseGypList(options.classpath)
17 classpath = list(set(classpath)) 17 classpath = list(set(classpath))
18 libraryjars = ':'.join(classpath) 18 libraryjars = ':'.join(classpath)
19 # proguard does its own dependency checking, which can be avoided by deleting 19 # proguard does its own dependency checking, which can be avoided by deleting
20 # the output. 20 # the output.
21 if os.path.exists(options.output_path): 21 if os.path.exists(options.output_path):
22 os.remove(options.output_path) 22 os.remove(options.output_path)
23 proguard_cmd = [options.proguard_path, 23 proguard_cmd = ['java', '-jar',
24 options.proguard_path,
24 '-injars', injars, 25 '-injars', injars,
25 '-outjars', outjars, 26 '-outjars', outjars,
26 '-libraryjars', libraryjars, 27 '-libraryjars', libraryjars,
27 '@' + options.proguard_config] 28 '@' + options.proguard_config]
28 build_utils.CheckOutput(proguard_cmd, print_stdout=True) 29 build_utils.CheckOutput(proguard_cmd, print_stdout=True)
29 30
30 31
31 def main(): 32 def main():
32 parser = optparse.OptionParser() 33 parser = optparse.OptionParser()
33 parser.add_option('--proguard-path', 34 parser.add_option('--proguard-path',
34 help='Path to the proguard executable.') 35 help='Path to the proguard executable.')
35 parser.add_option('--input-path', 36 parser.add_option('--input-path',
36 help='Path to the .jar file proguard should run on.') 37 help='Path to the .jar file proguard should run on.')
37 parser.add_option('--output-path', help='Path to the generated .jar file.') 38 parser.add_option('--output-path', help='Path to the generated .jar file.')
38 parser.add_option('--proguard-config', 39 parser.add_option('--proguard-config',
39 help='Path to the proguard configuration file.') 40 help='Path to the proguard configuration file.')
40 parser.add_option('--classpath', help="Classpath for proguard.") 41 parser.add_option('--classpath', help="Classpath for proguard.")
41 parser.add_option('--stamp', help='Path to touch on success.') 42 parser.add_option('--stamp', help='Path to touch on success.')
42 43
43 options, _ = parser.parse_args() 44 options, _ = parser.parse_args()
44 45
45 DoProguard(options) 46 DoProguard(options)
46 47
47 if options.stamp: 48 if options.stamp:
48 build_utils.Touch(options.stamp) 49 build_utils.Touch(options.stamp)
49 50
50 51
51 if __name__ == '__main__': 52 if __name__ == '__main__':
52 sys.exit(main()) 53 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_jar.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698