commit 27cd9cbeb92cba1b3ead834e5a8167d57c822b62
author Tobias Thierer <tobiast@google.com> Tue Dec 05 15:21:10 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 05 15:21:10 2017 +0000
tree a0b179fee9cce861b12a2af957070735dbb2efef
parent b6b85b68670e8df17b70a6a5eac5251d98e7b72a
parent 07a8c19674daccbfcce30e606e3ce689671ce2c1

Merge "Fix lint to run under java 9."

tools/lint

diff --git a/tools/lint b/tools/lint
index 4a09eb9..0a54482 100755
--- a/tools/lint
+++ b/tools/lint
@@ -65,9 +65,17 @@
 
 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 "$@"