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

Commit 6765130b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Target Java 21 wherever Java 17 was being targeted" into main

parents 31432ecf 323e6f2e

java/sdk.go

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe 
		return JAVA_VERSION_9

	} else if sdk.FinalOrFutureInt() <= 33 {

		return JAVA_VERSION_11

	} else if sdk.FinalOrFutureInt() <= 35 {

		return JAVA_VERSION_17

	} else if ctx.Config().TargetsJava21() {

		// Build flag that controls whether Java 21 is used as the

		// default target version, or Java 17.