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

Commit 59c1e6ac authored Mar 04, 2022 by Colin Cross

Support experimental building with OpenJDK 17

Use EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true to build with OpenJDK 17
while still targeting java language version 11.

Bug: 219098645
Test: m EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true
Change-Id: I89fb04ecde4dbd1e102098f316692624dd67f8a2

parent fe86b81a

java/config/config.go

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,12 @@ func init() {
	if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {		if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {
	return override		return override
	}		}
			switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN") {
			case "true":
			return "17"
			default:
	return "11"		return "11"
			}
	})		})

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

ui/build/config.go

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -368,10 +368,14 @@ func NewConfig(ctx Context, args ...string) Config {
	java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())		java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())
	java9Home := filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag())		java9Home := filepath.Join("prebuilts/jdk/jdk9", ret.HostPrebuiltTag())
	java11Home := filepath.Join("prebuilts/jdk/jdk11", ret.HostPrebuiltTag())		java11Home := filepath.Join("prebuilts/jdk/jdk11", ret.HostPrebuiltTag())
			java17Home := filepath.Join("prebuilts/jdk/jdk17", ret.HostPrebuiltTag())
	javaHome := func() string {		javaHome := func() string {
	if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {		if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
	return override		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" {		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.")		ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN is no longer supported. An OpenJDK 11 toolchain is now the global default.")
	}		}