Update to JDK 11.
- updated to errorprone usages as a java plugin.
- moved to setting Gradle JDK in studio instead of Studio JDK
itself https://developer.android.com/studio/command-line/variables#envar
Test: ./gradlew assembleDebug
Also tested opening studio, it now sets the correct Gradle JDK
Change-Id: I5a6d129363ad4e594daab03c9ef795efe4cdb698
diff --git a/gradlew b/gradlew
index 45ff842..47bfa80 100755
--- a/gradlew
+++ b/gradlew
@@ -104,8 +104,9 @@
# setup from each lint module.
export ANDROID_HOME="$APP_HOME/../../prebuilts/fullsdk-$plat"
# override JAVA_HOME, because CI machines have it and it points to very old JDK
-export JAVA_HOME="$APP_HOME/../../prebuilts/jdk/jdk8/$plat-x86"
-export STUDIO_JDK=$JAVA_HOME
+export JAVA_HOME="$APP_HOME/../../prebuilts/jdk/jdk11/$plat-x86"
+export JAVA_TOOLS_JAR="$APP_HOME/../../prebuilts/jdk/jdk8/$plat-x86/lib/tools.jar"
+export STUDIO_GRADLE_JDK=$JAVA_HOME
# ----------------------------------------------------------------------------
