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

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

Issue 2336173003: Fix android depfiles to always list GN's outputs[0] (Closed)
Patch Set: fix cronet_package Created 4 years, 3 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/copy_ex.py ('k') | build/android/gyp/create_java_binary_script.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 2014 The Chromium Authors. All rights reserved. 3 # Copyright 2014 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 """Merges a list of jars into a single jar.""" 7 """Merges a list of jars into a single jar."""
8 8
9 import optparse 9 import optparse
10 import sys 10 import sys
11 11
12 from util import build_utils 12 from util import build_utils
13 13
14 def main(args): 14 def main(args):
15 args = build_utils.ExpandFileArgs(args) 15 args = build_utils.ExpandFileArgs(args)
16 parser = optparse.OptionParser() 16 parser = optparse.OptionParser()
17 build_utils.AddDepfileOption(parser) 17 build_utils.AddDepfileOption(parser)
18 parser.add_option('--output', help='Path to output jar.') 18 parser.add_option('--output', help='Path to output jar.')
19 parser.add_option('--inputs', action='append', help='List of jar inputs.') 19 parser.add_option('--inputs', action='append', help='List of jar inputs.')
20 options, _ = parser.parse_args(args) 20 options, _ = parser.parse_args(args)
21 build_utils.CheckOptions(options, parser, ['output', 'inputs']) 21 build_utils.CheckOptions(options, parser, ['output', 'inputs'])
22 22
23 input_jars = [] 23 input_jars = []
24 for inputs_arg in options.inputs: 24 for inputs_arg in options.inputs:
25 input_jars.extend(build_utils.ParseGnList(inputs_arg)) 25 input_jars.extend(build_utils.ParseGnList(inputs_arg))
26 26
27 build_utils.MergeZips(options.output, input_jars) 27 build_utils.MergeZips(options.output, input_jars)
28 28
29 if options.depfile: 29 if options.depfile:
30 build_utils.WriteDepfile( 30 build_utils.WriteDepfile(options.depfile, options.output, input_jars)
31 options.depfile,
32 input_jars + build_utils.GetPythonDependencies())
33 31
34 32
35 if __name__ == '__main__': 33 if __name__ == '__main__':
36 sys.exit(main(sys.argv[1:])) 34 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « build/android/gyp/copy_ex.py ('k') | build/android/gyp/create_java_binary_script.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698