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

Commit e6e81c3f authored by Zi Wang's avatar Zi Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary slice in combined_apis bp2build converter" am:... 

Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa am: fa96bb55 am: 33d89a20 am: 7ad2efd6 am: dbeae06c

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



Change-Id: I4047b9a83029124e6681bc0a71216bf2833d7211
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f9247c1 dbeae06c

api/api.go

+1 −3
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ type bazelCombinedApisAttributes struct { 
// combined_apis bp2build converter

func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) {

	basePrefix := "non-updatable"

	scopeNames := []string{"public", "system", "module-lib", "system-server"}

	scopeToSuffix := map[string]string{

		"public":        "-current.txt",

		"system":        "-system-current.txt",
@@ -426,8 +425,7 @@ func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) { 
		"system-server": "-system-server-current.txt",

	}



	for _, scopeName := range scopeNames{

		suffix := scopeToSuffix[scopeName]

	for scopeName, suffix := range scopeToSuffix{

		name := a.Name() + suffix



		var scope bazel.StringAttribute