commit 5b97b2184774433b8f4bb5d45b92ed6493cdda15
author Christopher Parsons <cparsons@google.com> Wed Sep 20 18:32:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 20 18:32:15 2023 +0000
tree 807f68b4313b4b47fae09e858810593582dd02b6
parent e94531c63eda2faf3d9376600d2308dec4f366e8
parent 0eaa4339271f7da1902f154d22dc0f8fa3800c27

Merge "Change ConvertWithBp2build signature" into main am: 0eaa433927

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2751686

Change-Id: Ifbe695574139c1f1f674da0470f6b1885114bcad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

api/api.go

diff --git a/api/api.go b/api/api.go
index e09be03..431d6d8 100644
--- a/api/api.go
+++ b/api/api.go
@@ -429,7 +429,7 @@
 }
 
 // combined_apis bp2build converter
-func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
+func (a *CombinedApis) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
 	basePrefix := "non-updatable"
 	scopeToSuffix := map[string]string{
 		"public":        "-current.txt",