Merge "Revert "Hacky workaround for half-finalized builds."" into sc-dev

This commit is contained in:
Jeff Sharkey 2021-06-15 03:51:41 +00:00 committed by Android (Google) Code Review
commit 930610f64b
1 changed files with 1 additions and 2 deletions

View File

@ -363,8 +363,7 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
cmd.FlagWithOutput("--generate-api-levels ", d.apiVersionsXml)
cmd.FlagWithInput("--apply-api-levels ", d.apiVersionsXml)
cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD
// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
filename := proptools.StringDefault(d.properties.Api_levels_jar_filename, "android.jar")