StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Java 21 as a known version" into main am: db70a80cc7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048694

Change-Id: I437a09346d2d5eb1c045128bf0960ed85dad28e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2024-04-22 07:27:54 +00:00
committed by Automerger Merge Worker
parent 2b322b7424 db70a80cc7
commit 0dbffbcee4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -587,6 +587,7 @@ const (
JAVA_VERSION_9 = 9 JAVA_VERSION_9 = 9
JAVA_VERSION_11 = 11 JAVA_VERSION_11 = 11
JAVA_VERSION_17 = 17 JAVA_VERSION_17 = 17
JAVA_VERSION_21 = 21
) )
func (v javaVersion) String() string { func (v javaVersion) String() string {
@@ -605,6 +606,8 @@ func (v javaVersion) String() string {
return "11" return "11"
case JAVA_VERSION_17: case JAVA_VERSION_17:
return "17" return "17"
case JAVA_VERSION_21:
return "21"
default: default:
return "unsupported" return "unsupported"
} }
@@ -647,6 +650,8 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav
return JAVA_VERSION_11 return JAVA_VERSION_11
case "17": case "17":
return JAVA_VERSION_17 return JAVA_VERSION_17
case "21":
return JAVA_VERSION_21
case "10", "12", "13", "14", "15", "16": case "10", "12", "13", "14", "15", "16":
ctx.PropertyErrorf("java_version", "Java language level %s is not supported", javaVersion) ctx.PropertyErrorf("java_version", "Java language level %s is not supported", javaVersion)
return JAVA_VERSION_UNSUPPORTED return JAVA_VERSION_UNSUPPORTED