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

Commit 4d3f11cc authored Feb 14, 2023 by Julien Desprez Committed by Gerrit Code Review Feb 14, 2023

Merge "Revert "Reland "Target Java 17"""

parents 76683665 91ba6c7e

android/config.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -727,6 +727,10 @@ func (c *config) IsEnvFalse(key string) bool {
		return value == "0" \|\| value == "n" \|\| value == "no" \|\| value == "off" \|\| value == "false"
		}

		func (c *config) TargetsJava17() bool {
		return c.IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_17")
		}

		// EnvDeps returns the environment variables this build depends on. The first
		// call to this function blocks future reads from the environment.
		func (c *config) EnvDeps() map[string]string {

java/java.go

+7 −1

Original line number	Diff line number	Diff line
		@@ -517,8 +517,14 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an
		return normalizeJavaVersion(ctx, javaVersion)
		} else if ctx.Device() {
		return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx))
		} else {
		} else if ctx.Config().TargetsJava17() {
		// Temporary experimental flag to be able to try and build with
		// java version 17 options. The flag, if used, just sets Java
		// 17 as the default version, leaving any components that
		// target an older version intact.
		return JAVA_VERSION_17
		} else {
		return JAVA_VERSION_11
		}
		}

java/sdk.go

+7 −3

Original line number	Diff line number	Diff line
		@@ -57,10 +57,14 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
		return JAVA_VERSION_8
		} else if sdk.FinalOrFutureInt() <= 31 {
		return JAVA_VERSION_9
		} else if sdk.FinalOrFutureInt() <= 32 {
		return JAVA_VERSION_11
		} else {
		} else if ctx.Config().TargetsJava17() {
		// Temporary experimental flag to be able to try and build with
		// java version 17 options. The flag, if used, just sets Java
		// 17 as the default version, leaving any components that
		// target an older version intact.
		return JAVA_VERSION_17
		} else {
		return JAVA_VERSION_11
		}
		}