diff options
| author | 2023-03-15 17:47:10 +0000 | |
|---|---|---|
| committer | 2023-03-15 17:47:10 +0000 | |
| commit | 33d89a20f74222e184b6f670348c42d85cdb758e (patch) | |
| tree | 398c731b178a64f258834c5c6e4f7903a7e57e2d /api/api.go | |
| parent | d4c5eac3811c94d2989af8f6cc30aa8a31e2915a (diff) | |
| parent | fa96bb552c9054e69cce28561c996f7268709e24 (diff) | |
Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa7d am: fa96bb552c
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>
Diffstat (limited to 'api/api.go')
| -rw-r--r-- | api/api.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/api/api.go b/api/api.go index 25d97282035e..9876abb8ce36 100644 --- a/api/api.go +++ b/api/api.go @@ -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 |