StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Hacky workaround for half-finalized builds."" into sc-dev am: 930610f64b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14882690

Change-Id: I3502a944c9a03d572b3a0698d5070954a60b4393
This commit is contained in:
Jeff Sharkey
2021-06-15 03:54:48 +00:00
committed by Automerger Merge Worker
parent f7b27b0632 930610f64b
commit e5d41508bd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/droidstubs.go
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")