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

Commit 6984e882 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Support experimental building with OpenJDK 17 am: 59c1e6ac 

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

Change-Id: I2e7c2335299034ea07f55c4b1615f67bbe1deed6
parents 6e826bab 59c1e6ac

java/config/config.go

+6 −1
Original line number Diff line number Diff line
@@ -105,7 +105,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 −0
Original line number Diff line number Diff line
@@ -368,10 +368,14 @@ func NewConfig(ctx Context, args ...string) Config { 
	java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())

	java9Home := filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag())

	java11Home := filepath.Join("prebuilts/jdk/jdk11", ret.HostPrebuiltTag())

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

	javaHome := func() string {

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

		}