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

Commit 44022c86 authored by Ken Sun's avatar Ken Sun Committed by Gerrit Code Review
Browse files

Merge "Revert "Use the toolchain from JDK 17""

parents 1ea00ebb be3a561a

java/config/config.go

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

			return override

		}

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

		case "true":

			return "17"

		default:

			return "11"

		}

	})



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

ui/build/config.go

+4 −4
Original line number Diff line number Diff line
@@ -387,13 +387,13 @@ func NewConfig(ctx Context, args ...string) Config { 
		if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {

			return override

		}

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

			return java17Home

		}

		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.")

		}

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

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

		}

		return java17Home

		return java11Home

	}()

	absJavaHome := absPath(ctx, javaHome)