diff options
Diffstat (limited to 'java/droidstubs.go')
| -rw-r--r-- | java/droidstubs.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index b3241cca9..aa6a35ce9 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -564,8 +564,18 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a }) } if apiVersions != nil { - cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String()) - cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + // We are migrating from a single API level to major.minor + // versions and PlatformSdkVersionFull is not yet set in all + // release configs. If it is not set, fall back on the single + // API level. + if fullSdkVersion := ctx.Config().PlatformSdkVersionFull(); len(fullSdkVersion) > 0 { + cmd.FlagWithArg("--current-version ", fullSdkVersion) + } else { + cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String()) + } + if ctx.Config().PlatformSdkVersion().String() != "36" || ctx.Config().PlatformSdkCodename() != "Baklava" { + cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + } cmd.FlagWithInput("--apply-api-levels ", apiVersions) } } |