From d6be9e51ca5d935087d6735dd5d8dc2c40801ae7 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Fri, 7 Oct 2022 15:24:12 +0100 Subject: Target Java 17 Bug: 233029164 Test: TH Change-Id: I750b866565c264eb4f4ac14ebc88be6fc9b1b458 --- java/java.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 3b0ad8d9f..6e428cb1f 100644 --- a/java/java.go +++ b/java/java.go @@ -510,14 +510,8 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an return normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() { return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx)) - } else if ctx.Config().TargetsJava17() { - // Temporary experimental flag to be able to try and build with - // java version 17 options. The flag, if used, just sets Java - // 17 as the default version, leaving any components that - // target an older version intact. - return JAVA_VERSION_17 } else { - return JAVA_VERSION_11 + return JAVA_VERSION_17 } } -- cgit v1.2.3-59-g8ed1b