From 1fe2cc883f9bcc961c0f5f11bf83605230ff59be Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Fri, 19 Apr 2024 10:45:55 +0100 Subject: Add Java 21 as a known version Bug: 335612268 Test: Set java_version to 21 in core-all && m Change-Id: Ie2093187cec75949ae3bb4903edfb6f62aa31f6e --- java/java.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index ca99e6991..a48ac0a13 100644 --- a/java/java.go +++ b/java/java.go @@ -587,6 +587,7 @@ const ( JAVA_VERSION_9 = 9 JAVA_VERSION_11 = 11 JAVA_VERSION_17 = 17 + JAVA_VERSION_21 = 21 ) func (v javaVersion) String() string { @@ -605,6 +606,8 @@ func (v javaVersion) String() string { return "11" case JAVA_VERSION_17: return "17" + case JAVA_VERSION_21: + return "21" default: return "unsupported" } @@ -647,6 +650,8 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav return JAVA_VERSION_11 case "17": return JAVA_VERSION_17 + case "21": + return JAVA_VERSION_21 case "10", "12", "13", "14", "15", "16": ctx.PropertyErrorf("java_version", "Java language level %s is not supported", javaVersion) return JAVA_VERSION_UNSUPPORTED -- cgit v1.2.3-59-g8ed1b