From 1fbf7f21a452d372c629e6736ee17a216c23a926 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Fri, 3 Feb 2023 18:20:03 +0000 Subject: Reland "Target Java 17" This reverts commit 384250c7c45c01f474b0e941890382e6d097cca2. Reason for revert: Relanding the feature. Bug: 233029164 Change-Id: Ib66deabbf6e9604798c70edaf581f46db848e6ca --- java/sdk.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'java/sdk.go') diff --git a/java/sdk.go b/java/sdk.go index b0da5afba..10ae3f6e8 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -57,14 +57,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_8 } else if sdk.FinalOrFutureInt() <= 31 { return JAVA_VERSION_9 - } 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 { + } else if sdk.FinalOrFutureInt() <= 32 { return JAVA_VERSION_11 + } else { + return JAVA_VERSION_17 } } -- cgit v1.2.3-59-g8ed1b