diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-05 15:29:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-05 15:29:26 +0000 |
| commit | cd38f0b21292f2b37aeb9aa05b4f5f9cf2fec22a (patch) | |
| tree | 324ffb725ee29414eff80b92e899f6f2d4de5d50 | |
| parent | 4385b1eb9664f881011e448b58d9dd548c28ab26 (diff) | |
| parent | 477a0c01f9f678a32a957effc3dc267e8fd4f605 (diff) | |
| download | devtools-cd38f0b21292f2b37aeb9aa05b4f5f9cf2fec22a.tar.gz | |
Merge "Fix lint to run under java 9." am: 27cd9cbeb9
am: 477a0c01f9
Change-Id: I057d255f17606fa58d3f257bac271f460ab33865
| -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 "$@" |