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

Commit c0244da2 authored by Sorin Basca's avatar Sorin Basca
Browse files

Adding configuration support for Java 11 

Bug: 195387073
Test: m
Change-Id: Ibf26f35b83b300acacae800f9962a00916869412
parent 245b1bf4

java/java.go

+7 −2
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ const ( 
	JAVA_VERSION_7           = 7

	JAVA_VERSION_8           = 8

	JAVA_VERSION_9           = 9

	JAVA_VERSION_11          = 11

)



func (v javaVersion) String() string {
@@ -459,6 +460,8 @@ func (v javaVersion) String() string { 
		return "1.8"

	case JAVA_VERSION_9:

		return "1.9"

	case JAVA_VERSION_11:

		return "11"

	default:

		return "unsupported"

	}
@@ -479,8 +482,10 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav 
		return JAVA_VERSION_8

	case "1.9", "9":

		return JAVA_VERSION_9

	case "10", "11":

		ctx.PropertyErrorf("java_version", "Java language levels above 9 are not supported")

	case "11":

		return JAVA_VERSION_11

	case "10":

		ctx.PropertyErrorf("java_version", "Java language levels 10 is not supported")

		return JAVA_VERSION_UNSUPPORTED

	default:

		ctx.PropertyErrorf("java_version", "Unrecognized Java language level")