From 8d3e0bb25edd55f296c0d361868e223ddbaec587 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 20 Jan 2022 15:21:51 +0000 Subject: Revert "Setting Java 11 as the default version" Revert submission 1944928-default-java11 Reason for revert: Post-submit failures Reverted Changes: Ia9a0aa2a4:Setting Java 11 as the default version Ibf5d10521:Setting Java 11 as the default version Fixes: 215504708 Fixes: 215502091 Fixes: 215502091 Change-Id: I2f9866deff41406aede24758f6eda5e5808c7f29 --- 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 e3e972153..bb7c32be8 100644 --- a/java/java.go +++ b/java/java.go @@ -450,8 +450,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().TargetsJava11() { + // 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 } } -- cgit v1.2.3-59-g8ed1b