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

Merge "Updates checkapi filename properties behavior" am: 6b5430203c am: 0ae6ce2b99

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

Change-Id: Ie59adc18c7873bba3f9da7a89a3b2522528a4859
This commit is contained in:
Liz Kammer
2020-09-14 21:30:00 +00:00
committed by Automerger Merge Worker
parent 3728f3b498 0ae6ce2b99
commit 7aa68f1849
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/droiddoc.go
View File

@@ -181,12 +181,6 @@ type DroiddocProperties struct {
// filegroup or genrule can be included within this property. // filegroup or genrule can be included within this property.
Knowntags []string `android:"path"` Knowntags []string `android:"path"`
// the generated public API filename by Doclava.
Api_filename *string
// the generated removed API filename by Doclava.
Removed_api_filename *string
// if set to true, generate docs through Dokka instead of Doclava. // if set to true, generate docs through Dokka instead of Doclava.
Dokka_enabled *bool Dokka_enabled *bool
@@ -195,10 +189,10 @@ type DroiddocProperties struct {
} }
type DroidstubsProperties struct { type DroidstubsProperties struct {
// the generated public API filename by Metalava. // The generated public API filename by Metalava, defaults to <module>_api.txt
Api_filename *string Api_filename *string
// the generated removed API filename by Metalava. // the generated removed API filename by Metalava, defaults to <module>_removed.txt
Removed_api_filename *string Removed_api_filename *string
// the generated removed Dex API filename by Metalava. // the generated removed Dex API filename by Metalava.
@@ -1127,7 +1121,8 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil
if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") || if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") ||
apiCheckEnabled(ctx, d.properties.Check_api.Last_released, "last_released") || apiCheckEnabled(ctx, d.properties.Check_api.Last_released, "last_released") ||
String(d.properties.Api_filename) != "" { String(d.properties.Api_filename) != "" {
d.apiFile = android.PathForModuleOut(ctx, ctx.ModuleName()+"_api.txt") filename := proptools.StringDefault(d.properties.Api_filename, ctx.ModuleName()+"_api.txt")
d.apiFile = android.PathForModuleOut(ctx, filename)
cmd.FlagWithOutput("--api ", d.apiFile) cmd.FlagWithOutput("--api ", d.apiFile)
d.apiFilePath = d.apiFile d.apiFilePath = d.apiFile
} }
@@ -1135,7 +1130,8 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil
if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") || if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") ||
apiCheckEnabled(ctx, d.properties.Check_api.Last_released, "last_released") || apiCheckEnabled(ctx, d.properties.Check_api.Last_released, "last_released") ||
String(d.properties.Removed_api_filename) != "" { String(d.properties.Removed_api_filename) != "" {
d.removedApiFile = android.PathForModuleOut(ctx, ctx.ModuleName()+"_removed.txt") filename := proptools.StringDefault(d.properties.Removed_api_filename, ctx.ModuleName()+"_removed.txt")
d.removedApiFile = android.PathForModuleOut(ctx, filename)
cmd.FlagWithOutput("--removed-api ", d.removedApiFile) cmd.FlagWithOutput("--removed-api ", d.removedApiFile)
} }