From 384250c7c45c01f474b0e941890382e6d097cca2 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 2 Feb 2023 17:56:19 +0000 Subject: Revert "Target Java 17" This reverts commit d6be9e51ca5d935087d6735dd5d8dc2c40801ae7. Reason for revert: b/267608166. Change-Id: Ie07caa5ace3bcb290829e6fa476c5e1d47b975ba Fixed: 267608166 --- java/java.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'java/java.go') 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 } } -- cgit v1.2.3-59-g8ed1b