Snap for 6439596 from 9562f9a40812092c0604bbf3f2b8036cb731e7b8 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I4048c919838969ff23dc23b859d05c1cc729a9c5

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/lint b/tools/lint
index 1441ed1..0a54482 100755
--- a/tools/lint
+++ b/tools/lint
@@ -63,12 +63,19 @@ fi
 
 javaCmd="java"
 
-jaxbJar="$ANDROID_BUILD_TOP/prebuilts/tools/common/m2/repository/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.jar"
-jarpath="$frameworkdir/$jarfile:$jaxbJar"
+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 "$@"