From a1c9e9da550e9b72a7ed9a442f98ece25650d5dc Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Thu, 17 Oct 2019 14:52:07 +0100 Subject: Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9. Prior to this change, setting that to "false" turned the default Java language level back to 8. This change removes that option. Bug: 115604102 Test: m java droid docs tests cts Change-Id: I97bfd0dc8d941008b4071c6efe1c0c24950c4f1f --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index be48256af..71d009880 100644 --- a/java/java.go +++ b/java/java.go @@ -884,7 +884,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd ret = normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() && sdk <= 23 { ret = "1.7" - } else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() { + } else if ctx.Device() && sdk <= 29 { ret = "1.8" } else if ctx.Device() && sdkContext.sdkVersion() != "" && -- cgit v1.2.3-59-g8ed1b