diff options
| author | 2024-04-19 10:45:55 +0100 | |
|---|---|---|
| committer | 2024-04-19 10:45:55 +0100 | |
| commit | 1fe2cc883f9bcc961c0f5f11bf83605230ff59be (patch) | |
| tree | 84c65b566e8841f0bd67eb6900285ab0cf98d5f6 /java/java.go | |
| parent | c0df1afc072373446e204ff3e471abb25dd9175c (diff) | |
Add Java 21 as a known version
Bug: 335612268
Test: Set java_version to 21 in core-all && m
Change-Id: Ie2093187cec75949ae3bb4903edfb6f62aa31f6e
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
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 |