Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f3a70c0 authored by Pete Gillin's avatar Pete Gillin Committed by Gerrit Code Review
Browse files

Merge "Avoid targeting Java 9 for targets with SDK version up to 29."

parents 90b6561d 9c640141

java/java.go

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd 
		ret = javaVersion

	} else if ctx.Device() && sdk <= 23 {

		ret = "1.7"

	} else if ctx.Device() && sdk <= 28 || !ctx.Config().TargetOpenJDK9() {

	} else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() {

		ret = "1.8"

	} else if ctx.Device() && sdkContext.sdkVersion() != "" && sdk == android.FutureApiLevel {

		// TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current"