Remove containersInfo, complianceMetadataInfo and aconfigFilePaths from ModuleBase.

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

View File

@@ -116,9 +116,6 @@ type Module interface {
TransitivePackagingSpecs() []PackagingSpec
ConfigurableEvaluator(ctx ConfigAndErrorContext) proptools.ConfigurableEvaluator
// Get the information about the containers this module belongs to.
ContainersInfo() ContainersInfo
}
// Qualified id for a module
@@ -844,17 +841,6 @@ type ModuleBase struct {
buildParams []BuildParams
ruleParams map[blueprint.Rule]blueprint.RuleParams
variables map[string]string
// Merged Aconfig files for all transitive deps.
aconfigFilePaths Paths
// complianceMetadataInfo is for different module types to dump metadata.
// See android.ModuleContext interface.
complianceMetadataInfo *ComplianceMetadataInfo
// containersInfo stores the information about the containers and the information of the
// apexes the module belongs to.
containersInfo ContainersInfo
}
func (m *ModuleBase) AddJSONData(d *map[string]interface{}) {
@@ -2092,10 +2078,6 @@ func (m *ModuleBase) moduleInfoVariant(ctx ModuleContext) string {
return variant
}
func (m *ModuleBase) ContainersInfo() ContainersInfo {
return m.containersInfo
}
// Check the supplied dist structure to make sure that it is valid.
//
// property - the base property, e.g. dist or dists[1], which is combined with the