diff options
author | 2024-08-29 17:07:05 +0000 | |
---|---|---|
committer | 2024-08-29 17:07:05 +0000 | |
commit | 11d8b6e8d3608f81c416fd15e98bad4cb86e46bc (patch) | |
tree | 7c4bf9d5eeb502d94897500fe1dd33016bfcca8c /android/container.go | |
parent | 88a8daf8cae89783450b349d2a4217e6ed0c4a94 (diff) | |
parent | 9a99313ac67becf1d5d7ddbc5440af934d8d1710 (diff) |
Merge "Remove containersInfo, complianceMetadataInfo and aconfigFilePaths from ModuleBase." into main
Diffstat (limited to 'android/container.go')
-rw-r--r-- | android/container.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/android/container.go b/android/container.go index 43dccf635..f150ff31a 100644 --- a/android/container.go +++ b/android/container.go @@ -223,7 +223,6 @@ var containerBoundaryFunctionsTable = map[*container]containerBoundaryFunc{ // ---------------------------------------------------------------------------- type InstallableModule interface { - ContainersInfo() ContainersInfo StaticDependencyTags() []blueprint.DependencyTag DynamicDependencyTags() []blueprint.DependencyTag } @@ -417,7 +416,7 @@ func generateContainerInfo(ctx ModuleContext) ContainersInfo { func getContainerModuleInfo(ctx ModuleContext, module Module) (ContainersInfo, bool) { if ctx.Module() == module { - return module.ContainersInfo(), true + return ctx.getContainersInfo(), true } return OtherModuleProvider(ctx, module, ContainersInfoProvider) @@ -432,7 +431,7 @@ func setContainerInfo(ctx ModuleContext) { if _, ok := ctx.Module().(InstallableModule); ok { containersInfo := generateContainerInfo(ctx) - ctx.Module().base().containersInfo = containersInfo + ctx.setContainersInfo(containersInfo) SetProvider(ctx, ContainersInfoProvider, containersInfo) } } |