diff options
| author | 2023-02-14 20:26:31 +0000 | |
|---|---|---|
| committer | 2023-02-14 20:26:31 +0000 | |
| commit | 91ba6c7e01e03bde6e2f24b6d093603391149ae7 (patch) | |
| tree | 386c41f4d31ffba6795c267999a01554682f468f /java/sdk.go | |
| parent | 1fbf7f21a452d372c629e6736ee17a216c23a926 (diff) | |
Revert "Reland "Target Java 17""
This reverts commit 1fbf7f21a452d372c629e6736ee17a216c23a926.
Reason for revert: broke docker image, pinning is incomplete it seems
Change-Id: I7102cb233a4fe5ce0f5a1ead98cfc661c3d82ce5
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/sdk.go b/java/sdk.go index 10ae3f6e8..b0da5afba 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -57,10 +57,14 @@ 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 { - return JAVA_VERSION_11 - } else { + } 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 { + return JAVA_VERSION_11 } } |