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

Merge "Adding configuration support for Java 11" am: 5e4637dc1b am: c752b88ca8

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

Change-Id: I43283d18fa0871056da8866adb52ba8622a0d253
This commit is contained in:
Treehugger Robot
2021-12-01 22:55:50 +00:00
committed by Automerger Merge Worker
parent 0548808f44 c752b88ca8
commit 5f61c406f6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java.go
View File

@@ -447,6 +447,7 @@ const (
JAVA_VERSION_7 = 7 JAVA_VERSION_7 = 7
JAVA_VERSION_8 = 8 JAVA_VERSION_8 = 8
JAVA_VERSION_9 = 9 JAVA_VERSION_9 = 9
JAVA_VERSION_11 = 11
) )
func (v javaVersion) String() string { func (v javaVersion) String() string {
@@ -459,6 +460,8 @@ func (v javaVersion) String() string {
return "1.8" return "1.8"
case JAVA_VERSION_9: case JAVA_VERSION_9:
return "1.9" return "1.9"
case JAVA_VERSION_11:
return "11"
default: default:
return "unsupported" return "unsupported"
} }
@@ -479,8 +482,10 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav
return JAVA_VERSION_8 return JAVA_VERSION_8
case "1.9", "9": case "1.9", "9":
return JAVA_VERSION_9 return JAVA_VERSION_9
case "10", "11": case "11":
ctx.PropertyErrorf("java_version", "Java language levels above 9 are not supported") return JAVA_VERSION_11
case "10":
ctx.PropertyErrorf("java_version", "Java language levels 10 is not supported")
return JAVA_VERSION_UNSUPPORTED return JAVA_VERSION_UNSUPPORTED
default: default:
ctx.PropertyErrorf("java_version", "Unrecognized Java language level") ctx.PropertyErrorf("java_version", "Unrecognized Java language level")