From ce720c366327611b366db75737309870b59ed53e Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Tue, 24 May 2022 12:13:50 +0100 Subject: Add experimental option to target Java 17 Bug: 233029164 Test: EXPERIMENTAL_TARGET_JAVA_VERSION_17=true \ EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true m Change-Id: I80a9ba9eb356a460c1036e711e793c2ca6620f53 --- java/sdk.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'java/sdk.go') diff --git a/java/sdk.go b/java/sdk.go index 0dddd40aa..b0da5afba 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -57,6 +57,12 @@ 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 { return JAVA_VERSION_11 } -- cgit v1.2.3-59-g8ed1b