commit c1f1d87a6c5053d8024d40da313b5020c641520c
author Aurimas Liutikas <aurimas@google.com> Mon Nov 16 21:54:51 2020 +0000
committer Aurimas Liutikas <aurimas@google.com> Mon Nov 16 21:54:56 2020 +0000
tree 8e2f881f1cb4e4d2b86541b369d1b81ddcccce26
parent 4a6a650811184d5a4f3eb7cf9e48eab8b2122a7c

Set JAVA_HOME to JDK11 for building AGP

AGP now requires building with JDK11.

Change-Id: Ifd887b03c7b3b9157fb9887e0e377457b74b9d0f

androidx-studio-integration.sh

diff --git a/androidx-studio-integration.sh b/androidx-studio-integration.sh
index 35ad2d7..6a982c6 100755
--- a/androidx-studio-integration.sh
+++ b/androidx-studio-integration.sh
@@ -14,7 +14,7 @@
 export OUT_DIR=out
 export DIST_DIR="$DIST_DIR"
 
-JAVA_HOME="$(pwd)/prebuilts/studio/jdk/linux" tools/gradlew -p tools/ publishLocal --stacktrace
+JAVA_HOME="$(pwd)/prebuilts/studio/jdk/jdk11/linux" tools/gradlew -p tools/ publishLocal --stacktrace
 
 export LINT_VERSION=`grep -oP "(?<=baseVersion = ).*" tools/buildSrc/base/version.properties`
 export LINT_REPO="$(pwd)/out/repo"