diff options
| author | 2023-02-15 17:52:27 +0000 | |
|---|---|---|
| committer | 2023-02-15 17:52:27 +0000 | |
| commit | be302733f65323bfb0839283c3924b0b23deebaf (patch) | |
| tree | 47f6773ca7ec3d9cb128c01dcb87b2f8fb58f48c /java/sdk.go | |
| parent | 91ba6c7e01e03bde6e2f24b6d093603391149ae7 (diff) | |
Reland^2 "Target Java 17"
This reverts commit 91ba6c7e01e03bde6e2f24b6d093603391149ae7.
Reason for revert: Relanding Java 17
Change-Id: I6d0e64bb86b9f4a0f41baa33c3226c6316718456
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/java/sdk.go b/java/sdk.go index b0da5afba..10ae3f6e8 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 } } |