diff options
author | Tobias Thierer <tobiast@google.com> | 2017-12-05 15:21:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-05 15:21:10 +0000 |
commit | 27cd9cbeb92cba1b3ead834e5a8167d57c822b62 (patch) | |
tree | a0b179fee9cce861b12a2af957070735dbb2efef | |
parent | b6b85b68670e8df17b70a6a5eac5251d98e7b72a (diff) | |
parent | 07a8c19674daccbfcce30e606e3ce689671ce2c1 (diff) | |
download | devtools-27cd9cbeb92cba1b3ead834e5a8167d57c822b62.tar.gz |
Merge "Fix lint to run under java 9."
-rwxr-xr-x | tools/lint | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -65,9 +65,17 @@ javaCmd="java" jarpath="$frameworkdir/$jarfile" +is_java_version_9=$(java -version 2>&1| grep 'version [ "]9.*[ "]') +if [ "${is_java_version_9}" = "" ]; then + modules_arg="" +else + modules_arg="--add-modules=java.xml.bind" +fi + exec "$javaCmd" \ -Xmx512m $os_opts $java_debug \ -Dcom.android.tools.lint.bindir="$progdir" \ -Djava.awt.headless=true \ -classpath "$jarpath" \ + ${modules_arg} \ com.android.tools.lint.Main "$@" |