diff options
| author | 2023-03-15 18:26:18 +0000 | |
|---|---|---|
| committer | 2023-03-15 18:26:18 +0000 | |
| commit | 7ad2efd6925d6b6e407836e448059053442d80f8 (patch) | |
| tree | 0c53f7115bb8c71b616ba6e07f8b16533c27062b /api/api.go | |
| parent | a510217840f12d590b6cd19ebc9f0b85a261a23c (diff) | |
| parent | 33d89a20f74222e184b6f670348c42d85cdb758e (diff) | |
Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa7d am: fa96bb552c am: 33d89a20f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2478115
Change-Id: Ibc39fd1190e0d18be4e296e07da3e7d847e939a7
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 |