diff options
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 756a24deb..0dddd40aa 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -55,14 +55,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_7 } else if sdk.FinalOrFutureInt() <= 29 { return JAVA_VERSION_8 - } else if ctx.Config().TargetsJava11() { - // Temporary experimental flag to be able to try and build with - // java version 11 options. The flag, if used, just sets Java - // 11 as the default version, leaving any components that - // target an older version intact. - return JAVA_VERSION_11 - } else { + } else if sdk.FinalOrFutureInt() <= 31 { return JAVA_VERSION_9 + } else { + return JAVA_VERSION_11 } } |