diff options
| author | Colin Cross <ccross@android.com> | 2019-01-09 23:04:25 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-01-10 07:09:35 +0000 |
| commit | 98fd57460f718dbc06faeb6a029574e6f2a028b6 (patch) | |
| tree | 8b2a20eb3b33738c1235e808cd6359effd3b2be3 /java/java.go | |
| parent | fb6d78120233e5aff492fa827c27ba87354fc9e8 (diff) | |
Use latest SDK version for current in PDK builds
PDK builds need to use the latest SDK version instead of "current"
to match the behavior of Make.
Bug: 118634643
Test: sdk_test.go
Change-Id: Ice10d0ccb4066f27ce5839fc96a4026510057121
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) } |