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

Commit 5a2e36b7 authored by Sorin Basca's avatar Sorin Basca
Browse files

Switch to JDK 21 

Bug: 313924276
Test: n
Change-Id: Ia9682181a6ce35ed0102d60bf7df1def8f876fd0
parent 2d8884a3

java/config/config.go

+1 −6
Original line number Original line Diff line number Diff line
@@ -131,12 +131,7 @@ 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_OPENJDK21_TOOLCHAIN") {

		case "true":

		return "21"

		return "21"

		default:

			return "17"

		}

	})

	})





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

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

ui/build/config.go

+6 −7
Original line number Original line Diff line number Diff line
@@ -387,22 +387,21 @@ func NewConfig(ctx Context, args ...string) Config { 




	// Configure Java-related variables, including adding it to $PATH

	// Configure Java-related variables, including adding it to $PATH

	java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())

	java8Home := filepath.Join("prebuilts/jdk/jdk8", ret.HostPrebuiltTag())

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

	java21Home := filepath.Join("prebuilts/jdk/jdk21", ret.HostPrebuiltTag())

	java21Home := filepath.Join("prebuilts/jdk/jdk21", 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_OPENJDK21_TOOLCHAIN") {

			return java21Home

		}

		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 21 toolchain is now the global default.")

		}

		}

		if toolchain17, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN"); ok && toolchain17 != "true" {

		if toolchain17, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN"); ok && toolchain17 != "true" {

			ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN is no longer supported. An OpenJDK 17 toolchain is now the global default.")

			ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN is no longer supported. An OpenJDK 21 toolchain is now the global default.")

		}

		}

		return java17Home

		if toolchain21, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN"); ok && toolchain21 != "true" {

			ctx.Fatalln("The environment variable EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN is no longer supported. An OpenJDK 21 toolchain is now the global default.")

		}

		return java21Home

	}()

	}()

	absJavaHome := absPath(ctx, javaHome)

	absJavaHome := absPath(ctx, javaHome)