From 171c2103b89d38179119decea1be442015009caf Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Wed, 12 Jan 2022 16:04:50 +0000 Subject: Setting Java 11 as the default version Test: m Change-Id: Ia9a0aa2a4aa02d7b67ad8e1cb6083d33c3d75e70 --- 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