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

Merge "Fix normalize string for Java 17" am: 82392b747c

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

Change-Id: If36a70a4b3a13b110ab26340f0e114f74ec9b480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-22 18:47:50 +00:00
committed by Automerger Merge Worker
parent ed060fa87b 82392b747c
commit edb9757a41
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -528,7 +528,7 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav
case "11": case "11":
return JAVA_VERSION_11 return JAVA_VERSION_11
case "17": case "17":
return JAVA_VERSION_11 return JAVA_VERSION_17
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