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

Commit b0dc477e authored Mar 01, 2023 by Sorin Basca Committed by Gerrit Code Review Mar 01, 2023

Merge "Reland^2 "Target Java 17""

parents 29ff4182 be302733

android/config.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -727,10 +727,6 @@ 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

+1 −7

Original line number	Diff line number	Diff line
		@@ -517,14 +517,8 @@ 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().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
		return JAVA_VERSION_17
		}
		}

java/sdk.go

+3 −7

Original line number	Diff line number	Diff line
		@@ -57,14 +57,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
		return JAVA_VERSION_8
		} else if sdk.FinalOrFutureInt() <= 31 {
		return JAVA_VERSION_9
		} 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 {
		} else if sdk.FinalOrFutureInt() <= 32 {
		return JAVA_VERSION_11
		} else {
		return JAVA_VERSION_17
		}
		}