diff options
| author | 2024-04-22 07:08:02 +0000 | |
|---|---|---|
| committer | 2024-04-22 07:08:02 +0000 | |
| commit | db70a80cc73ec1ee05def317d1fd2d5d829a88f6 (patch) | |
| tree | 0ffa3b8c50c06c915e092eb407101c011d9aa725 /java/java.go | |
| parent | d50832c1224e952563a7f538c232e19772e651f9 (diff) | |
| parent | 1fe2cc883f9bcc961c0f5f11bf83605230ff59be (diff) | |
Merge "Add Java 21 as a known version" into main
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 2834c5f0c..725e25abe 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 |