commit 7880027af1a44ffe1c2b4ef8c874ff9c3a414b69
author Pete Gillin <peteg@google.com> Thu Jun 27 12:32:13 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 27 12:32:13 2019 -0700
tree 55a19319df65b91d5d79c01ab6efb51ba7b01a8e
parent 9562f9a40812092c0604bbf3f2b8036cb731e7b8
parent bc11a72a91685bb0a35e7ecf10ffcba4e07558bd

Merge "Make the linter use a JAXB jar instead of the deprecated module." am: 5410a8a911 am: 6089fd5fdd am: d74c94e4d5
am: bc11a72a91

Change-Id: I020b1d2fc77c38676e888234a6a594087368264b

tools/lint

diff --git a/tools/lint b/tools/lint
index 0a54482..1441ed1 100755
--- a/tools/lint
+++ b/tools/lint
@@ -63,19 +63,12 @@
 
 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
+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"
 
 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 "$@"