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

Commit a7a3d64a authored by Pete Gillin's avatar Pete Gillin
Browse files

Remove the EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN option. 

Previously, this setting environment variable to false reverted to an
OpenJDK 9 toolchain. This change removes that option.

Test: m core-all-system-modules
Test: zcat out/verbose.log.gz | grep 'prebuilts/jdk/jdk[0-9]*'
Test: EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=false m core-all-system-modules (fails)
Bug: 131683177
Change-Id: I0d679648e1236925ce3ef7e1652379127e846b00
parent a2affbbb

java/config/config.go

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

			return override

		}

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

		case "false":

			return "9"

		default:

		return "11"

		}

	})



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

ui/build/config.go

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

			return override

		}

		if toolchain9, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain9 == "false" {

			return java9Home

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

		}

		return java11Home

	}()