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

Commit 73b1de9c authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

Merge "Adding experimental option to target Java 11" am: eb59a6d3 am: 2aabb8de am: c6a840e4 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: I4e9f4476487af326b7f392be62a0d35ab2318a06
parents d7884557 c6a840e4

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

	}