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

39
android/module_context.go
View File

@@ -226,6 +226,12 @@ type ModuleContext interface {
// which usually happens in GenerateAndroidBuildActions() of a module type.
// See android.ModuleBase.complianceMetadataInfo
ComplianceMetadataInfo() *ComplianceMetadataInfo
// Get the information about the containers this module belongs to.
getContainersInfo() ContainersInfo
setContainersInfo(info ContainersInfo)
setAconfigPaths(paths Paths)
}
type moduleContext struct {
@@ -270,6 +276,17 @@ type moduleContext struct {
// moduleInfoJSON can be filled out by GenerateAndroidBuildActions to write a JSON file that will
// be included in the final module-info.json produced by Make.
moduleInfoJSON *ModuleInfoJSON
// containersInfo stores the information about the containers and the information of the
// apexes the module belongs to.
containersInfo ContainersInfo
// Merged Aconfig files for all transitive deps.
aconfigFilePaths Paths
// complianceMetadataInfo is for different module types to dump metadata.
// See android.ModuleContext interface.
complianceMetadataInfo *ComplianceMetadataInfo
}
var _ ModuleContext = &moduleContext{}
@@ -517,7 +534,11 @@ func (m *moduleContext) PackageFile(installPath InstallPath, name string, srcPat
}
func (m *moduleContext) getAconfigPaths() *Paths {
return &m.module.base().aconfigFilePaths
return &m.aconfigFilePaths
}
func (m *moduleContext) setAconfigPaths(paths Paths) {
m.aconfigFilePaths = paths
}
func (m *moduleContext) packageFile(fullInstallPath InstallPath, srcPath Path, executable bool) PackagingSpec {
@@ -768,12 +789,10 @@ func (m *moduleContext) SetLicenseInstallMap(installMap []string) {
}
func (m *moduleContext) ComplianceMetadataInfo() *ComplianceMetadataInfo {
if complianceMetadataInfo := m.module.base().complianceMetadataInfo; complianceMetadataInfo != nil {
return complianceMetadataInfo
if m.complianceMetadataInfo == nil {
m.complianceMetadataInfo = NewComplianceMetadataInfo()
}
complianceMetadataInfo := NewComplianceMetadataInfo()
m.module.base().complianceMetadataInfo = complianceMetadataInfo
return complianceMetadataInfo
return m.complianceMetadataInfo
}
// Returns a list of paths expanded from globs and modules referenced using ":module" syntax. The property must
@@ -813,3 +832,11 @@ func (m *moduleContext) HostRequiredModuleNames() []string {
func (m *moduleContext) TargetRequiredModuleNames() []string {
return m.module.TargetRequiredModuleNames()
}
func (m *moduleContext) getContainersInfo() ContainersInfo {
return m.containersInfo
}
func (m *moduleContext) setContainersInfo(info ContainersInfo) {
m.containersInfo = info
}