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

Commit bc57643e 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

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



Change-Id: Ida070630336f6fea65c10e91d38177beba0fefb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bf297fa f4b2b2a6

api/api.go

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,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",