diff options
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/java/sdk.go b/java/sdk.go index b0da5afba..855e5598a 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -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 } } @@ -388,10 +384,7 @@ func createAPIFingerprint(ctx android.SingletonContext) { } else if ctx.Config().FrameworksBaseDirExists(ctx) && !ctx.Config().AlwaysUsePrebuiltSdks() { cmd.Text("cat") apiTxtFileModules := []string{ - "frameworks-base-api-current.txt", - "frameworks-base-api-system-current.txt", - "frameworks-base-api-module-lib-current.txt", - "frameworks-base-api-system-server-current.txt", + "api_fingerprint", } count := 0 ctx.VisitAllModules(func(module android.Module) { @@ -402,10 +395,10 @@ func createAPIFingerprint(ctx android.SingletonContext) { } }) if count != len(apiTxtFileModules) { - ctx.Errorf("Could not find all the expected API modules %v, found %d\n", apiTxtFileModules, count) + ctx.Errorf("Could not find expected API module %v, found %d\n", apiTxtFileModules, count) return } - cmd.Text("| md5sum | cut -d' ' -f1 >"). + cmd.Text(">"). Output(out) } else { // Unbundled build |