Merge changes I2729001d,Ife5d2193

* changes:
  packaging: install/package deps if not marked IsHideFromMake
  Generate linker config with packaged items.
This commit is contained in:
Treehugger Robot
2021-05-12 22:08:54 +00:00
committed by Gerrit Code Review
3 changed files with 15 additions and 8 deletions

View File

@@ -1500,7 +1500,7 @@ func (m *ModuleBase) computeInstallDeps(ctx ModuleContext) ([]*installPathsDepSe
var installDeps []*installPathsDepSet
var packagingSpecs []*packagingSpecsDepSet
ctx.VisitDirectDeps(func(dep Module) {
if IsInstallDepNeeded(ctx.OtherModuleDependencyTag(dep)) {
if IsInstallDepNeeded(ctx.OtherModuleDependencyTag(dep)) && !dep.IsHideFromMake() {
installDeps = append(installDeps, dep.base().installFilesDepSet)
packagingSpecs = append(packagingSpecs, dep.base().packagingSpecsDepSet)
}