commit b641677d1b6e92ad022d32ff99ef79e2b391f4b6
author Christopher Parsons <cparsons@google.com> Wed Sep 20 21:15:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 20 21:15:09 2023 +0000
tree 7a6a8c31728a9e8072d5bbd9f838f0607f90962d
parent f2936a7d12a35575fdaef978b1f2e5edbbfe2edb
parent bc57643eec69f6042f7c73f674a61b8170ba9cff

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

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

Change-Id: I161dca7bb659ee1f2c27b8f27792dc33401226d7
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 6095a9a..83804c6 100644
--- a/api/api.go
+++ b/api/api.go
@@ -433,7 +433,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",