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

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

Issue 22870021: [Android] Makes GYP changes for EMMA coverage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverts accidental change in common.gypi, moves emma_device_jar to gyp Created 7 years, 4 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 | « build/android/gyp/ant.py ('k') | build/android/gyp/emma_instr.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 fnmatch
8 import optparse 7 import optparse
9 import os 8 import os
10 import sys 9 import sys
11 10
12 from util import build_utils 11 from util import build_utils
13 from util import md5_check 12 from util import md5_check
14 13
15 14
16 def DoDex(options, paths): 15 def DoDex(options, paths):
17 dx_binary = os.path.join(options.android_sdk_tools, 'dx') 16 dx_binary = os.path.join(options.android_sdk_tools, 'dx')
18
19 # See http://crbug.com/272064 for context on --force-jumbo. 17 # See http://crbug.com/272064 for context on --force-jumbo.
20 dex_cmd = [dx_binary, '--dex', '--force-jumbo', '--output', 18 dex_cmd = [dx_binary, '--dex', '--force-jumbo', '--output', options.dex_path]
21 options.dex_path] + paths 19 if options.no_locals != '0':
20 dex_cmd.append('--no-locals')
21 dex_cmd += paths
22 22
23 record_path = '%s.md5.stamp' % options.dex_path 23 record_path = '%s.md5.stamp' % options.dex_path
24 md5_check.CallAndRecordIfStale( 24 md5_check.CallAndRecordIfStale(
25 lambda: build_utils.CheckCallDie(dex_cmd, suppress_output=True), 25 lambda: build_utils.CheckCallDie(dex_cmd, suppress_output=True),
26 record_path=record_path, 26 record_path=record_path,
27 input_paths=paths, 27 input_paths=paths,
28 input_strings=dex_cmd) 28 input_strings=dex_cmd)
29 29
30 build_utils.Touch(options.dex_path) 30 build_utils.Touch(options.dex_path)
31 31
32 32
33 def main(argv): 33 def main(argv):
34 parser = optparse.OptionParser() 34 parser = optparse.OptionParser()
35 parser.add_option('--android-sdk-tools', 35 parser.add_option('--android-sdk-tools',
36 help='Android sdk build tools directory.') 36 help='Android sdk build tools directory.')
37 parser.add_option('--dex-path', help='Dex output path.') 37 parser.add_option('--dex-path', help='Dex output path.')
38 parser.add_option('--configuration-name', 38 parser.add_option('--configuration-name',
39 help='The build CONFIGURATION_NAME.') 39 help='The build CONFIGURATION_NAME.')
40 parser.add_option('--proguard-enabled', 40 parser.add_option('--proguard-enabled',
41 help='"true" if proguard is enabled.') 41 help='"true" if proguard is enabled.')
42 parser.add_option('--proguard-enabled-input-path', 42 parser.add_option('--proguard-enabled-input-path',
43 help='Path to dex in Release mode when proguard is enabled.') 43 help=('Path to dex in Release mode when proguard '
44 'is enabled.'))
45 parser.add_option('--no-locals',
46 help='Exclude locals list from the dex file.')
44 parser.add_option('--stamp', help='Path to touch on success.') 47 parser.add_option('--stamp', help='Path to touch on success.')
45 48
46 # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja. 49 # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
47 parser.add_option('--ignore', help='Ignored.') 50 parser.add_option('--ignore', help='Ignored.')
48 51
49 options, paths = parser.parse_args() 52 options, paths = parser.parse_args()
50 53
51 if (options.proguard_enabled == "true" 54 if (options.proguard_enabled == 'true'
52 and options.configuration_name == "Release"): 55 and options.configuration_name == 'Release'):
53 paths = [options.proguard_enabled_input_path] 56 paths = [options.proguard_enabled_input_path]
54 57
55 DoDex(options, paths) 58 DoDex(options, paths)
56 59
57 if options.stamp: 60 if options.stamp:
58 build_utils.Touch(options.stamp) 61 build_utils.Touch(options.stamp)
59 62
60 63
61 if __name__ == '__main__': 64 if __name__ == '__main__':
62 sys.exit(main(sys.argv)) 65 sys.exit(main(sys.argv))
63
OLDNEW
« no previous file with comments | « build/android/gyp/ant.py ('k') | build/android/gyp/emma_instr.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698