Target Java 17

Bug: 233029164
Test: TH
Change-Id: I750b866565c264eb4f4ac14ebc88be6fc9b1b458
This commit is contained in:
Sorin Basca
2022-10-07 15:24:12 +01:00
parent e0598a1cbd
commit d6be9e51ca
3 changed files with 4 additions and 18 deletions

View File

@@ -57,14 +57,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
return JAVA_VERSION_8
} else if sdk.FinalOrFutureInt() <= 31 {
return JAVA_VERSION_9
} else if ctx.Config().TargetsJava17() {
// Temporary experimental flag to be able to try and build with
// java version 17 options. The flag, if used, just sets Java
// 17 as the default version, leaving any components that
// target an older version intact.
return JAVA_VERSION_17
} else {
} else if sdk.FinalOrFutureInt() <= 32 {
return JAVA_VERSION_11
} else {
return JAVA_VERSION_17
}
}