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

Merge "Pass the current API file to the metalava --use-same-format-as option" into main am: 64876012de am: 41ce7e62e1 am: 4ea34ac332 am: 0ca0c697bc am: c2c0065996

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

Change-Id: I7eaceee55fdc7a5fe6bf48af475cdd0a18ae94e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2023-08-12 17:33:06 +00:00
committed by Automerger Merge Worker
parent 8bbe824e77 c2c0065996
commit a0436a88dc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/droidstubs.go
View File

@@ -694,6 +694,13 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
cmd.FlagWithArg("--error-message:compatibility:released ", msg)
}
if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") {
// Pass the current API file into metalava so it can use it as the basis for determining how to
// generate the output signature files (both api and removed).
currentApiFile := android.PathForModuleSrc(ctx, String(d.properties.Check_api.Current.Api_file))
cmd.FlagWithInput("--use-same-format-as ", currentApiFile)
}
if generateStubs {
rule.Command().
BuiltTool("soong_zip").