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

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

Issue 2142413004: Add required deps to third_party/android_support_test_runner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments from agrieve Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/javac.py
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index c8425bd3aa578880d0b88f46440569c97670b589..af9188be9a50c66313668770d1b0f69ee84a069b 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -257,6 +257,10 @@ def _ParseOptions(argv):
help='Boot classpath for javac. If this is specified multiple times, '
'they will all be appended to construct the classpath.')
parser.add_option(
+ '--java-version',
+ default='',
agrieve 2016/08/24 01:42:30 nit: no need to use '' as the default. just remove
aluo 2016/08/24 17:14:49 Acknowledged.
+ help='Java language version to use in -source and -target args to javac.')
+ parser.add_option(
'--classpath',
action='append',
help='Classpath for javac. If this is specified multiple times, they '
@@ -379,10 +383,14 @@ def main(argv):
if options.bootclasspath:
javac_cmd.extend([
- '-bootclasspath', ':'.join(options.bootclasspath),
- '-source', '1.7',
- '-target', '1.7',
- ])
+ '-bootclasspath', ':'.join(options.bootclasspath)
+ ])
+
+ if options.java_version:
+ javac_cmd.extend([
+ '-source', options.java_version,
+ '-target', options.java_version,
+ ])
if options.chromium_code:
javac_cmd.extend(['-Xlint:unchecked', '-Xlint:deprecation'])
« no previous file with comments | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698