summaryrefslogtreecommitdiff
path: root/android/container.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2024-08-27 23:21:06 +0000
committer Yu Liu <yudiliu@google.com> 2024-08-28 00:02:48 +0000
commit9a99313ac67becf1d5d7ddbc5440af934d8d1710 (patch)
treefa722e8b5a469055562ed808da9c8021b62cef75 /android/container.go
parent4297ad904697cfb57606d84e6a6099144df367c1 (diff)
Remove containersInfo, complianceMetadataInfo and aconfigFilePaths from ModuleBase.
Bug: 358425833 Test: Manually verified all the generated ninja and mk files and CI. Change-Id: I896659491e75bb2eacca93d2e4a83ead50e218d2
Diffstat (limited to 'android/container.go')
-rw-r--r--android/container.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/android/container.go b/android/container.go
index 10aff4d2b..f01c07606 100644
--- a/android/container.go
+++ b/android/container.go
@@ -219,7 +219,6 @@ var containerBoundaryFunctionsTable = map[*container]containerBoundaryFunc{
// ----------------------------------------------------------------------------
type InstallableModule interface {
- ContainersInfo() ContainersInfo
StaticDependencyTags() []blueprint.DependencyTag
DynamicDependencyTags() []blueprint.DependencyTag
}
@@ -413,7 +412,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)
@@ -428,7 +427,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)
}
}