Merge "Pass the current API file to the metalava --use-same-format-as option" into udc-mainline-prod
diff --git a/java/droidstubs.go b/java/droidstubs.go
index faa7f7d..521afd0 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -695,6 +695,13 @@
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").