Merge "Correct SDK version for Java 17" am: 71eca49214 am: 16661aab12

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2468461

Change-Id: Ief7933787d94830370d5918c7defd6109e56810d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2023-03-08 08:56:25 +00:00
committed by Automerger Merge Worker

View File

@@ -57,7 +57,7 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
return JAVA_VERSION_8
} else if sdk.FinalOrFutureInt() <= 31 {
return JAVA_VERSION_9
} else if sdk.FinalOrFutureInt() <= 32 {
} else if sdk.FinalOrFutureInt() <= 33 {
return JAVA_VERSION_11
} else {
return JAVA_VERSION_17