StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove containersInfo, complianceMetadataInfo and aconfigFilePaths from ModuleBase.

Browse Source 
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: I896659491e75bb2eacca93d2e4a83ead50e218d2
This commit is contained in:
Yu Liu
2024-08-27 23:21:06 +00:00
parent 4297ad9046
commit 9a99313ac6
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/container.go
View File

@@ -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)
}
}