From 4584a8ac8e1d9aababf835ea088350b48975a54a Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 3 Oct 2018 18:05:04 +0900 Subject: [PATCH] sdk_version <= 28 implies Java 1.8 When sdk_version is equal to or less than 28, java_version is implied to 1.8 unless it is explicitly specified. It was 26 originally, and is now updated to 28 which is the most recent API version. Bug: 117069453 Test: EXPERIMENTAL_USE_OPENJDK9=true make apex_aidl_interface Change-Id: I18ebe3ec51ada54103f6d203b9bfae8ec6ea5d90 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"