diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 9955be9c6..fa4aee43d 100644 --- a/java/java.go +++ b/java/java.go @@ -777,7 +777,18 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sdkContext) string { var ret string - sdk, err := sdkVersionToNumber(ctx, sdkContext.sdkVersion()) + v := sdkContext.sdkVersion() + // For PDK builds, use the latest SDK version instead of "current" + if ctx.Config().IsPdkBuild() && (v == "" || v == "current") { + sdkVersions := ctx.Config().Get(sdkSingletonKey).([]int) + latestSdkVersion := 0 + if len(sdkVersions) > 0 { + latestSdkVersion = sdkVersions[len(sdkVersions)-1] + } + v = strconv.Itoa(latestSdkVersion) + } + + sdk, err := sdkVersionToNumber(ctx, v) if err != nil { ctx.PropertyErrorf("sdk_version", "%s", err) } |