diff options
| author | 2018-10-03 14:41:02 +0000 | |
|---|---|---|
| committer | 2018-10-03 14:41:02 +0000 | |
| commit | 0d7fd7f70a4e0d5ca026cfa484625546f9e07fb4 (patch) | |
| tree | 72333cd1294ad94cc31961523a761f45fc14f0ab /java/java.go | |
| parent | 72cf0a8479399a53782734ebd93f2522d69ab202 (diff) | |
| parent | 4584a8ac8e1d9aababf835ea088350b48975a54a (diff) | |
Merge "sdk_version <= 28 implies Java 1.8"
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 7fd534446..8b354d91d 100644 --- a/java/java.go +++ b/java/java.go @@ -892,7 +892,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd ret = javaVersion } else if ctx.Device() && sdk <= 23 { ret = "1.7" - } else if ctx.Device() && sdk <= 26 || !ctx.Config().TargetOpenJDK9() { + } else if ctx.Device() && sdk <= 28 || !ctx.Config().TargetOpenJDK9() { ret = "1.8" } else if ctx.Device() && sdkContext.sdkVersion() != "" && sdk == android.FutureApiLevel { // TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current" |