Merge "Switch to an OpenJDK 11 toolchain by default."
diff --git a/java/config/config.go b/java/config/config.go
index f418ee7..1c55961 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -88,10 +88,10 @@
})
pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string {
switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN") {
- case "true":
- return "11"
- default:
+ case "false":
return "9"
+ default:
+ return "11"
}
})
diff --git a/ui/build/config.go b/ui/build/config.go
index 919b9ce..686ca3e 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -219,10 +219,10 @@
if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
return override
}
- if toolchain11, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain11 == "true" {
- return java11Home
+ if toolchain9, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain9 == "false" {
+ return java9Home
}
- return java9Home
+ return java11Home
}()
absJavaHome := absPath(ctx, javaHome)