Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb6d705d authored by Yu Liu's avatar Yu Liu
Browse files

Remove packagingSpecsDepSet from ModuleBase. 

The external code that depends on this field has been changed to use the
new interface, this field can be removed now.

Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: I12cb6e22c091bc90d3a3cbbf554e81b8dc27e264
parent 3e4458bf

android/module.go

+2 −12
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ type Module interface { 
	TargetRequiredModuleNames() []string

	VintfFragmentModuleNames(ctx ConfigAndErrorContext) []string



	// TransitivePackagingSpecs returns the PackagingSpecs for this module and any transitive

	// dependencies with dependency tags for which IsInstallDepNeeded() returns true.

	TransitivePackagingSpecs() []PackagingSpec



	ConfigurableEvaluator(ctx ConfigAndErrorContext) proptools.ConfigurableEvaluator



	// Get the information about the containers this module belongs to.
@@ -834,7 +830,6 @@ type ModuleBase struct { 
	primaryLicensesProperty applicableLicensesProperty



	noAddressSanitizer bool

	packagingSpecsDepSet *DepSet[PackagingSpec]



	hooks hooks
@@ -1455,10 +1450,6 @@ func isInstallDepNeeded(dep Module, tag blueprint.DependencyTag) bool { 
	return IsInstallDepNeededTag(tag)

}



func (m *ModuleBase) TransitivePackagingSpecs() []PackagingSpec {

	return m.packagingSpecsDepSet.ToList()

}



func (m *ModuleBase) NoAddressSanitizer() bool {

	return m.noAddressSanitizer

}
@@ -1986,8 +1977,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) 


	ctx.TransitiveInstallFiles = NewDepSet[InstallPath](TOPOLOGICAL, ctx.installFiles, dependencyInstallFiles)

	installFiles.TransitiveInstallFiles = ctx.TransitiveInstallFiles

	m.packagingSpecsDepSet = NewDepSet[PackagingSpec](TOPOLOGICAL, ctx.packagingSpecs, dependencyPackagingSpecs)

	installFiles.TransitivePackagingSpecs = m.packagingSpecsDepSet

	installFiles.TransitivePackagingSpecs = NewDepSet[PackagingSpec](TOPOLOGICAL, ctx.packagingSpecs, dependencyPackagingSpecs)



	SetProvider(ctx, InstallFilesProvider, installFiles)

	buildLicenseMetadata(ctx, ctx.licenseMetadataFile)