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

Merge "Remove packagingSpecsDepSet from ModuleBase." into main am: b41b74fa2c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3246174

Change-Id: Ib5b209deff46e89873e2e053daa8b1fbe791d929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2024-08-28 17:14:25 +00:00
committed by Automerger Merge Worker
parent cd722aaade b41b74fa2c
commit dd898d855b
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/module.go
View File

@@ -111,10 +111,6 @@ type Module interface {
TargetRequiredModuleNames() []string TargetRequiredModuleNames() []string
VintfFragmentModuleNames(ctx ConfigAndErrorContext) []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 ConfigurableEvaluator(ctx ConfigAndErrorContext) proptools.ConfigurableEvaluator
// Get the information about the containers this module belongs to. // Get the information about the containers this module belongs to.
@@ -834,7 +830,6 @@ type ModuleBase struct {
primaryLicensesProperty applicableLicensesProperty primaryLicensesProperty applicableLicensesProperty
noAddressSanitizer bool noAddressSanitizer bool
packagingSpecsDepSet *DepSet[PackagingSpec]
hooks hooks hooks hooks
@@ -1451,10 +1446,6 @@ func isInstallDepNeeded(dep Module, tag blueprint.DependencyTag) bool {
return IsInstallDepNeededTag(tag) return IsInstallDepNeededTag(tag)
} }
func (m *ModuleBase) TransitivePackagingSpecs() []PackagingSpec {
return m.packagingSpecsDepSet.ToList()
}
func (m *ModuleBase) NoAddressSanitizer() bool { func (m *ModuleBase) NoAddressSanitizer() bool {
return m.noAddressSanitizer return m.noAddressSanitizer
} }
@@ -1989,8 +1980,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
ctx.TransitiveInstallFiles = NewDepSet[InstallPath](TOPOLOGICAL, ctx.installFiles, dependencyInstallFiles) ctx.TransitiveInstallFiles = NewDepSet[InstallPath](TOPOLOGICAL, ctx.installFiles, dependencyInstallFiles)
installFiles.TransitiveInstallFiles = ctx.TransitiveInstallFiles installFiles.TransitiveInstallFiles = ctx.TransitiveInstallFiles
m.packagingSpecsDepSet = NewDepSet[PackagingSpec](TOPOLOGICAL, ctx.packagingSpecs, dependencyPackagingSpecs) installFiles.TransitivePackagingSpecs = NewDepSet[PackagingSpec](TOPOLOGICAL, ctx.packagingSpecs, dependencyPackagingSpecs)
installFiles.TransitivePackagingSpecs = m.packagingSpecsDepSet
SetProvider(ctx, InstallFilesProvider, installFiles) SetProvider(ctx, InstallFilesProvider, installFiles)
buildLicenseMetadata(ctx, ctx.licenseMetadataFile) buildLicenseMetadata(ctx, ctx.licenseMetadataFile)