diff options
| author | 2019-10-28 10:28:19 +0000 | |
|---|---|---|
| committer | 2019-10-28 10:28:19 +0000 | |
| commit | ef99a4b06e9dc12bdc8299f25981714ef035c2ee (patch) | |
| tree | 1e56b8efb03597a67cfd840264de1b900213fcbe /java/java.go | |
| parent | d3f11c13b1b2a924fd4311b716d29f29b1b7ea7c (diff) | |
| parent | a1c9e9da550e9b72a7ed9a442f98ece25650d5dc (diff) | |
Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 99867c893..9ed76214f 100644 --- a/java/java.go +++ b/java/java.go @@ -887,7 +887,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd ret = normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() && sdk <= 23 { ret = "1.7" - } else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() { + } else if ctx.Device() && sdk <= 29 { ret = "1.8" } else if ctx.Device() && sdkContext.sdkVersion() != "" && |