diff options
Diffstat (limited to 'api/api.go')
| -rw-r--r-- | api/api.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/api/api.go b/api/api.go index 09c238336a39..103e5acc1c68 100644 --- a/api/api.go +++ b/api/api.go @@ -164,26 +164,26 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) { } func createMergedAnnotationsFilegroups(ctx android.LoadHookContext, modules, system_server_modules []string) { - for _, i := range []struct{ + for _, i := range []struct { name string tag string modules []string }{ { - name: "all-modules-public-annotations", - tag: "{.public.annotations.zip}", + name: "all-modules-public-annotations", + tag: "{.public.annotations.zip}", modules: modules, }, { - name: "all-modules-system-annotations", - tag: "{.system.annotations.zip}", + name: "all-modules-system-annotations", + tag: "{.system.annotations.zip}", modules: modules, }, { - name: "all-modules-module-lib-annotations", - tag: "{.module-lib.annotations.zip}", + name: "all-modules-module-lib-annotations", + tag: "{.module-lib.annotations.zip}", modules: modules, }, { - name: "all-modules-system-server-annotations", - tag: "{.system-server.annotations.zip}", + name: "all-modules-system-server-annotations", + tag: "{.system-server.annotations.zip}", modules: system_server_modules, }, } { @@ -245,6 +245,8 @@ func createMergedFrameworkImpl(ctx android.LoadHookContext, modules []string) { // First create updatable-framework-module-impl, which contains all updatable modules. // This module compiles against module_lib SDK. { + // TODO(b/214988855): remove the line below when framework-bluetooth has an impl jar. + modules = remove(modules, "framework-bluetooth") props := libraryProps{} props.Name = proptools.StringPtr("updatable-framework-module-impl") props.Static_libs = transformArray(modules, "", ".impl") @@ -374,7 +376,7 @@ func (a *CombinedApis) ConvertWithBp2build(ctx android.TopDownMutatorContext) { "system-server": "-system-server-current.txt", } - for scopeName, suffix := range scopeToSuffix{ + for scopeName, suffix := range scopeToSuffix { name := a.Name() + suffix var scope bazel.StringAttribute |