Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa7d am: fa96bb552c

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

Change-Id: If08768948396d5bffe93a899524874414e48f38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2023-03-15 17:47:10 +00:00
committed by Automerger Merge Worker
parent d4c5eac381 fa96bb552c
commit 33d89a20f7
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/api.go
View File

@@ -418,7 +418,6 @@ type bazelCombinedApisAttributes struct {
// combined_apis bp2build converter // combined_apis bp2build converter
func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) { func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
basePrefix := "non-updatable" basePrefix := "non-updatable"
scopeNames := []string{"public", "system", "module-lib", "system-server"}
scopeToSuffix := map[string]string{ scopeToSuffix := map[string]string{
"public": "-current.txt", "public": "-current.txt",
"system": "-system-current.txt", "system": "-system-current.txt",
@@ -426,8 +425,7 @@ func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
"system-server": "-system-server-current.txt", "system-server": "-system-server-current.txt",
} }
for _, scopeName := range scopeNames{ for scopeName, suffix := range scopeToSuffix{
suffix := scopeToSuffix[scopeName]
name := a.Name() + suffix name := a.Name() + suffix
var scope bazel.StringAttribute var scope bazel.StringAttribute