diff options
| author | 2019-06-14 06:29:48 +0000 | |
|---|---|---|
| committer | 2019-06-14 06:29:48 +0000 | |
| commit | b11c72b0b8fb98f52ca9a64807954ef4ebef7da4 (patch) | |
| tree | 4d8193bfde8214efda797af97448df36815da11a /java/java.go | |
| parent | 60b393ce851f04eb749f8e1fc1d030c4991288ca (diff) | |
| parent | 52d398a84197053a624c13a0bc1cfb78df996966 (diff) | |
Merge "Add sdk_version:"none" to replace no_standard_libs:true"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 82f799e83..c42ca28e8 100644 --- a/java/java.go +++ b/java/java.go @@ -682,7 +682,7 @@ func getLinkType(m *Module, name string) (ret linkType, stubs bool) { return javaSdk, true case ver == "current": return javaSdk, false - case ver == "": + case ver == "" || ver == "none": return javaPlatform, false default: if _, err := strconv.Atoi(ver); err != nil { @@ -860,7 +860,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd var ret string v := sdkContext.sdkVersion() // For PDK builds, use the latest SDK version instead of "current" - if ctx.Config().IsPdkBuild() && (v == "" || v == "current") { + if ctx.Config().IsPdkBuild() && (v == "" || v == "none" || v == "current") { sdkVersions := ctx.Config().Get(sdkVersionsKey).([]int) latestSdkVersion := 0 if len(sdkVersions) > 0 { @@ -879,7 +879,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd ret = "1.7" } else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() { ret = "1.8" - } else if ctx.Device() && sdkContext.sdkVersion() != "" && sdk == android.FutureApiLevel { + } else if ctx.Device() && sdkContext.sdkVersion() != "" && sdkContext.sdkVersion() != "none" && sdk == android.FutureApiLevel { // TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current" ret = "1.8" } else { |