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

Merge changes from topic "may27-sdk" into sc-dev am: 799822d7af

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

Change-Id: I20bdc60c55090e2182584bfbb23c23b2bc560395
This commit is contained in:
Jeff Sharkey
2021-06-02 20:14:12 +00:00
committed by Automerger Merge Worker
parent af898dbc17 799822d7af
commit 525d95ea09
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/droidstubs.go
View File

@@ -363,7 +363,8 @@ 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())
cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD
// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
filename := proptools.StringDefault(d.properties.Api_levels_jar_filename, "android.jar")