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

Commit 72813feb authored by Pete Gillin's avatar Pete Gillin Committed by Gerrit Code Review
Browse files

Merge "Switch to an OpenJDK 11 toolchain by default."

parents 4945e785 abbcddaa

java/config/config.go

+3 −3
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ func init() { 
	})

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

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

		case "true":

			return "11"

		default:

		case "false":

			return "9"

		default:

			return "11"

		}

	})

ui/build/config.go

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

			return override

		}

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

			return java11Home

		}

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

			return java9Home

		}

		return java11Home

	}()

	absJavaHome := absPath(ctx, javaHome)