diff options
| author | Sorin Basca <sorinbasca@google.com> | 2023-02-03 18:20:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-03 18:20:03 +0000 |
| commit | 1fbf7f21a452d372c629e6736ee17a216c23a926 (patch) | |
| tree | 47f6773ca7ec3d9cb128c01dcb87b2f8fb58f48c /java/java.go | |
| parent | 384250c7c45c01f474b0e941890382e6d097cca2 (diff) | |
Reland "Target Java 17"
This reverts commit 384250c7c45c01f474b0e941890382e6d097cca2.
Reason for revert: Relanding the feature.
Bug: 233029164
Change-Id: Ib66deabbf6e9604798c70edaf581f46db848e6ca
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/java.go b/java/java.go index 3b0ad8d9f..6e428cb1f 100644 --- a/java/java.go +++ b/java/java.go @@ -510,14 +510,8 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an return normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() { return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx)) - } 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 + return JAVA_VERSION_17 } } |