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

Commit 31d57588 authored by Pete Gillin's avatar Pete Gillin Committed by Gerrit Code Review
Browse files

Merge changes I0d679648,I31542e7f 

* changes:
  Remove the EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN option.
  Add a new option OVERRIDE_JLINK_VERSION_NUMBER.
parents b21ed428 a7a3d64a

java/config/config.go

+3 −5
Original line number Diff line number Diff line
@@ -87,12 +87,10 @@ func init() { 
		return ctx.Config().Getenv("ANDROID_JAVA_HOME")

	})

	pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string {

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

		case "false":

			return "9"

		default:

			return "11"

		if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {

			return override

		}

		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

	}()