Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b641677d authored by Christopher Parsons's avatar Christopher Parsons Committed by Automerger Merge Worker
Browse files

Merge "Change ConvertWithBp2build signature" into main am: 0eaa4339 am:... 

Merge "Change ConvertWithBp2build signature" into main am: 0eaa4339 am: 5b97b218 am: 5f857bb6 am: f4b2b2a6 am: bc57643e

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



Change-Id: I161dca7bb659ee1f2c27b8f27792dc33401226d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2936a7d bc57643e

api/api.go

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ type bazelCombinedApisAttributes struct { 
}



// 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",