Merge "Implicitly bump up Java target to 1.8" into main (ce8d2541) · Commits · e / os / android_build_soong

java/java.go

+12 −6

Original line number	Diff line number	Diff line
		@@ -564,9 +564,11 @@ const (
		func (v javaVersion) String() string {
		switch v {
		case JAVA_VERSION_6:
		return "1.6"
		// Java version 1.6 no longer supported, bumping to 1.8
		return "1.8"
		case JAVA_VERSION_7:
		return "1.7"
		// Java version 1.7 no longer supported, bumping to 1.8
		return "1.8"
		case JAVA_VERSION_8:
		return "1.8"
		case JAVA_VERSION_9:
		@@ -583,10 +585,12 @@ func (v javaVersion) String() string {
		func (v javaVersion) StringForKotlinc() string {
		// $ ./external/kotlinc/bin/kotlinc -jvm-target foo
		// error: unknown JVM target version: foo
		// Supported versions: 1.6, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17
		// Supported versions: 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17
		switch v {
		case JAVA_VERSION_6:
		return "1.8"
		case JAVA_VERSION_7:
		return "1.6"
		return "1.8"
		case JAVA_VERSION_9:
		return "9"
		default:
		@@ -602,9 +606,11 @@ func (v javaVersion) usesJavaModules() bool {
		func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) javaVersion {
		switch javaVersion {
		case "1.6", "6":
		return JAVA_VERSION_6
		// Java version 1.6 no longer supported, bumping to 1.8
		return JAVA_VERSION_8
		case "1.7", "7":
		return JAVA_VERSION_7
		// Java version 1.7 no longer supported, bumping to 1.8
		return JAVA_VERSION_8
		case "1.8", "8":
		return JAVA_VERSION_8
		case "1.9", "9":

+1 −3

Original line number	Diff line number	Diff line
		@@ -47,9 +47,7 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
		if err != nil {
		ctx.PropertyErrorf("sdk_version", "%s", err)
		}
		if sdk.FinalOrFutureInt() <= 23 {
		return JAVA_VERSION_7
		} else if sdk.FinalOrFutureInt() <= 29 {
		if sdk.FinalOrFutureInt() <= 29 {
		return JAVA_VERSION_8
		} else if sdk.FinalOrFutureInt() <= 31 {
		return JAVA_VERSION_9