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

Commit 8f7ee30d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support experimental building with OpenJDK 21" into main

parents 29e05d10 0760c898

java/config/config.go

+6 −1
Original line number Diff line number Diff line
@@ -133,7 +133,12 @@ func init() { 
		if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {

			return override

		}

		switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") {

		case "true":

			return "21"

		default:

			return "17"

		}

	})



	pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin")

ui/build/config.go

+4 −0
Original line number Diff line number Diff line
@@ -384,10 +384,14 @@ func NewConfig(ctx Context, args ...string) Config { 
	// Configure Java-related variables, including adding it to $PATH

	java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())

	java17Home := filepath.Join("prebuilts/jdk/jdk17", ret.HostPrebuiltTag())

	java21Home := filepath.Join("prebuilts/jdk/jdk21", ret.HostPrebuiltTag())

	javaHome := func() string {

		if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {

			return override

		}

		if ret.environ.IsEnvTrue("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") {

			return java21Home

		}

		if toolchain11, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain11 != "true" {

			ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN is no longer supported. An OpenJDK 11 toolchain is now the global default.")

		}