Make metalava studio integration work again
- Build with JDK17
- Read the right file for the version
Test: presubmit
Change-Id: I8cdfd092e03adaf6f3a1bf779df75354f0c10720
diff --git a/androidx-studio-integration.sh b/androidx-studio-integration.sh
index 6946b0a..fef2861 100755
--- a/androidx-studio-integration.sh
+++ b/androidx-studio-integration.sh
@@ -14,9 +14,13 @@
export OUT_DIR=out
export DIST_DIR="$DIST_DIR"
-JAVA_HOME="$(pwd)/prebuilts/studio/jdk/jdk11/linux" tools/gradlew -p tools/ publishLocal --stacktrace
+JAVA_HOME="$(pwd)/prebuilts/studio/jdk/jdk17/linux" tools/gradlew -p tools/ publishLocal --stacktrace
-export LINT_VERSION=`grep -oP "(?<=baseVersion = ).*" tools/buildSrc/base/version.properties`
+# Depend on the generated version.properties file, as the version depends on
+# the release flag
+versionProperties="$OUT_DIR/build/base/builder-model/build/resources/main/com/android/builder/model/version.properties"
+# Mac grep doesn't support -P, so use perl version of `grep -oP "(?<=buildVersion = ).*"`
+export LINT_VERSION=`perl -nle'print $& while m{(?<=baseVersion=).*}g' $versionProperties`
export LINT_REPO="$(pwd)/out/repo"
JAVA_HOME="$(pwd)/prebuilts/jdk/jdk17/linux-x86/" tools/gradlew -p tools/metalava \
