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

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

Issue 579543003: Revert of Set the javac target and source to 1.7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « base/android/java/src/org/chromium/base/CollectionUtil.java ('k') | no next file » | 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 7 import fnmatch
8 import optparse 8 import optparse
9 import os 9 import os
10 import shutil 10 import shutil
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 jar_inputs = [] 72 jar_inputs = []
73 for path in classpath: 73 for path in classpath:
74 if os.path.exists(path + '.TOC'): 74 if os.path.exists(path + '.TOC'):
75 jar_inputs.append(path + '.TOC') 75 jar_inputs.append(path + '.TOC')
76 else: 76 else:
77 jar_inputs.append(path) 77 jar_inputs.append(path)
78 78
79 javac_args = [ 79 javac_args = [
80 '-g', 80 '-g',
81 '-source', '1.7', 81 '-source', '1.5',
82 '-target', '1.7', 82 '-target', '1.5',
83 '-classpath', ':'.join(classpath), 83 '-classpath', ':'.join(classpath),
84 '-d', classes_dir] 84 '-d', classes_dir]
85 if chromium_code: 85 if chromium_code:
86 javac_args.extend(['-Xlint:unchecked', '-Xlint:deprecation']) 86 javac_args.extend(['-Xlint:unchecked', '-Xlint:deprecation'])
87 else: 87 else:
88 # XDignore.symbol.file makes javac compile against rt.jar instead of 88 # XDignore.symbol.file makes javac compile against rt.jar instead of
89 # ct.sym. This means that using a java internal package/class will not 89 # ct.sym. This means that using a java internal package/class will not
90 # trigger a compile warning or error. 90 # trigger a compile warning or error.
91 javac_args.extend(['-XDignore.symbol.file']) 91 javac_args.extend(['-XDignore.symbol.file'])
92 92
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 input_files + build_utils.GetPythonDependencies()) 211 input_files + build_utils.GetPythonDependencies())
212 212
213 if options.stamp: 213 if options.stamp:
214 build_utils.Touch(options.stamp) 214 build_utils.Touch(options.stamp)
215 215
216 216
217 if __name__ == '__main__': 217 if __name__ == '__main__':
218 sys.exit(main(sys.argv[1:])) 218 sys.exit(main(sys.argv[1:]))
219 219
220 220
OLDNEW
« no previous file with comments | « base/android/java/src/org/chromium/base/CollectionUtil.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698