From 8ef3e6fd028ed55aee2c715a3a7de74be8df09d6 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Fri, 26 Nov 2021 17:27:24 +0000 Subject: [PATCH] Adding experimental option to target Java 11 Bug: 195387073 Test: m Test: EXPERIMENTAL_TARGET_JAVA_VERSION_11=true m Change-Id: Ifd7ce6218a2761a8eaf79af7d91210da2fa581aa --- java/java.go | 6 ++++++ java/sdk.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/java/java.go b/java/java.go index ee1fd8ad3..90a1b8999 100644 --- a/java/java.go +++ b/java/java.go @@ -434,6 +434,12 @@ 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().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") { + // Temporary experimental flag to be able to try and build with + // java version 11 options. The flag, if used, just sets Java + // 11 as the default version, leaving any components that + // target an older version intact. + return JAVA_VERSION_11 } else { return JAVA_VERSION_9 } diff --git a/java/sdk.go b/java/sdk.go index e6bf220b4..de7070eef 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -55,6 +55,12 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_7 } else if sdk.FinalOrFutureInt() <= 29 { return JAVA_VERSION_8 + } else if ctx.Config().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") { + // Temporary experimental flag to be able to try and build with + // java version 11 options. The flag, if used, just sets Java + // 11 as the default version, leaving any components that + // target an older version intact. + return JAVA_VERSION_11 } else { return JAVA_VERSION_9 }