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

Commit 8ef3e6fd authored by Sorin Basca's avatar Sorin Basca
Browse files

Adding experimental option to target Java 11 

Bug: 195387073
Test: m
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_11=true m
Change-Id: Ifd7ce6218a2761a8eaf79af7d91210da2fa581aa
parent c01a5cd7

java/java.go

+6 −0
Original line number Diff line number Diff line
@@ -434,6 +434,12 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an 
		return normalizeJavaVersion(ctx, javaVersion)

	} else if ctx.Device() {

		return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx))

	} else if ctx.Config().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") {

		// Temporary experimental flag to be able to try and build with

		// java version 11 options.  The flag, if used, just sets Java

		// 11 as the default version, leaving any components that

		// target an older version intact.

		return JAVA_VERSION_11

	} else {

		return JAVA_VERSION_9

	}

java/sdk.go

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe 
		return JAVA_VERSION_7

	} else if sdk.FinalOrFutureInt() <= 29 {

		return JAVA_VERSION_8

	} else if ctx.Config().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") {

		// Temporary experimental flag to be able to try and build with

		// java version 11 options. The flag, if used, just sets Java

		// 11 as the default version, leaving any components that

		// target an older version intact.

		return JAVA_VERSION_11

	} else {

		return JAVA_VERSION_9

	}