From 384250c7c45c01f474b0e941890382e6d097cca2 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 2 Feb 2023 17:56:19 +0000 Subject: [PATCH] Revert "Target Java 17" This reverts commit d6be9e51ca5d935087d6735dd5d8dc2c40801ae7. Reason for revert: b/267608166. Change-Id: Ie07caa5ace3bcb290829e6fa476c5e1d47b975ba Fixed: 267608166 --- android/config.go | 4 ++++ java/java.go | 8 +++++++- java/sdk.go | 10 +++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/android/config.go b/android/config.go index 255c836bf..d5ed883fa 100644 --- a/android/config.go +++ b/android/config.go @@ -723,6 +723,10 @@ func (c *config) IsEnvFalse(key string) bool { return value == "0" || value == "n" || value == "no" || value == "off" || value == "false" } +func (c *config) TargetsJava17() bool { + return c.IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_17") +} + // EnvDeps returns the environment variables this build depends on. The first // call to this function blocks future reads from the environment. func (c *config) EnvDeps() map[string]string { diff --git a/java/java.go b/java/java.go index 6e428cb1f..3b0ad8d9f 100644 --- a/java/java.go +++ b/java/java.go @@ -510,8 +510,14 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an return normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() { return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx)) - } else { + } 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 } } diff --git a/java/sdk.go b/java/sdk.go index 10ae3f6e8..b0da5afba 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -57,10 +57,14 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_8 } else if sdk.FinalOrFutureInt() <= 31 { return JAVA_VERSION_9 - } else if sdk.FinalOrFutureInt() <= 32 { - return JAVA_VERSION_11 - } else { + } 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 } }