diff options
author | Pete Gillin <peteg@google.com> | 2019-06-27 06:07:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-27 06:07:05 -0700 |
commit | 6089fd5fdd714073bc9ce2f527fb84a2c4ca4b80 (patch) | |
tree | 55a19319df65b91d5d79c01ab6efb51ba7b01a8e | |
parent | 1fe150086e5e73af02b26ae0da9966408437499d (diff) | |
parent | 5410a8a911398b674d48b67d5f8645c8bbc84731 (diff) | |
download | devtools-6089fd5fdd714073bc9ce2f527fb84a2c4ca4b80.tar.gz |
Merge "Make the linter use a JAXB jar instead of the deprecated module."
am: 5410a8a911
Change-Id: Ifac8b4bc56c24b5790e532ea5d499731f9f44cb1
-rwxr-xr-x | tools/lint | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -63,19 +63,12 @@ fi 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 "$@" |