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

Merge "Normalize and validate the java_version property."

Browse Source
This commit is contained in:
Treehugger Robot
2019-08-29 18:15:07 +00:00
committed by Gerrit Code Review
parent 1e7f14b1d5 4e8b48a055
commit 17f4728d4b
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/java.go
View File

@@ -907,7 +907,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd
ctx.PropertyErrorf("sdk_version", "%s", err) ctx.PropertyErrorf("sdk_version", "%s", err)
} }
if javaVersion != "" { if javaVersion != "" {
ret = javaVersion ret = normalizeJavaVersion(ctx, javaVersion)
} else if ctx.Device() && sdk <= 23 { } else if ctx.Device() && sdk <= 23 {
ret = "1.7" ret = "1.7"
} else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() { } else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() {
@@ -926,6 +926,25 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd
return ret return ret
} }
func normalizeJavaVersion(ctx android.ModuleContext, javaVersion string) string {
switch javaVersion {
case "1.6", "6":
return "1.6"
case "1.7", "7":
return "1.7"
case "1.8", "8":
return "1.8"
case "1.9", "9":
return "1.9"
case "10", "11":
ctx.PropertyErrorf("java_version", "Java language levels above 9 are not supported")
return "unsupported"
default:
ctx.PropertyErrorf("java_version", "Unrecognized Java language level")
return "unrecognized"
}
}
func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaBuilderFlags { func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaBuilderFlags {
var flags javaBuilderFlags var flags javaBuilderFlags