commit bc57643eec69f6042f7c73f674a61b8170ba9cff
author Christopher Parsons <cparsons@google.com> Wed Sep 20 20:09:47 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 20 20:09:47 2023 +0000
tree 65c75f8ccff8336121e94041e82dae72f919c344
parent 6bf297faa23491ac720da7eafebdfb8ca17d5f9a
parent f4b2b2a6713bd1fbf964bd7ec9a744d97da5bd9f

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

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

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