From 323e6f2e3bd7186c8b52c77ef495ea43ce427f7b Mon Sep 17 00:00:00 2001
From: Sorin Basca <sorinbasca@google.com>
Date: Fri, 8 Nov 2024 18:06:53 +0000
Subject: Target Java 21 wherever Java 17 was being targeted

Bug: 342332820
Change-Id: I640f1175a81bc3d8ef9707968e274d9eb33a9356
Test: TH
---
 java/sdk.go | 2 --
 1 file changed, 2 deletions(-)

(limited to 'java/sdk.go')

diff --git a/java/sdk.go b/java/sdk.go
index 036521c86..bb2aa8d7e 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -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.
-- 
cgit v1.2.3-59-g8ed1b