diff options
author | Pete Gillin <peteg@google.com> | 2019-06-27 09:33:26 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-27 09:33:26 -0700 |
commit | bc11a72a91685bb0a35e7ecf10ffcba4e07558bd (patch) | |
tree | 55a19319df65b91d5d79c01ab6efb51ba7b01a8e | |
parent | 9562f9a40812092c0604bbf3f2b8036cb731e7b8 (diff) | |
parent | d74c94e4d5ec304560c689dd487c6d8d369dbb4c (diff) | |
download | devtools-bc11a72a91685bb0a35e7ecf10ffcba4e07558bd.tar.gz |
Merge "Make the linter use a JAXB jar instead of the deprecated module." am: 5410a8a911 am: 6089fd5fddandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-r-beta-3android-r-beta-2android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-release
am: d74c94e4d5
Change-Id: I857c06305e5aaa89557ed543424f2326e10275cd
-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 "$@" |