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

Merge "Remove containersInfo, complianceMetadataInfo and aconfigFilePaths from ModuleBase." into main

Browse Source
This commit is contained in:
Yu Liu
2024-08-29 17:07:05 +00:00
committed by Gerrit Code Review
parent 88a8daf8ca 9a99313ac6
commit 11d8b6e8d3
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

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