From 18ecf61090cd987e049aadfea6371ea4ca651b06 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Sun, 23 Jan 2022 09:01:07 +0000 Subject: Revert^2: "Setting Java 11 as the default version" Reverted Change: I2f9866deff41406aede24758f6eda5e5808c7f29 Reason for revert: Post-submission failure have been fixed. Test: presubmit Bug: 195387473 Change-Id: If5db1614ef455e2f1eae1d36cf514e13e7aab993 --- java/java.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index bb7c32be8..e3e972153 100644 --- a/java/java.go +++ b/java/java.go @@ -450,14 +450,8 @@ 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().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 + return JAVA_VERSION_11 } } -- cgit v1.2.3-59-g8ed1b