commit f4b2b2a6713bd1fbf964bd7ec9a744d97da5bd9f
author Christopher Parsons <cparsons@google.com> Wed Sep 20 19:28:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 20 19:28:37 2023 +0000
tree 76e94deedaddffcd30491a7f5f645e215a6cc271
parent 2e3d9ce05f89a90e92785b375bbbf6f58de55c9c
parent 5f857bb64874908b95d562781b0bf4779e1a0055

Merge "Change ConvertWithBp2build signature" into main am: 0eaa433927 am: 5b97b21847 am: 5f857bb648

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

Change-Id: Ifecd8a6b5de8ed370090bc80ca9a38ae844d6d7b
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",