Revert "Add SkipToTransitiveDepsTag interface for dependency tags"
This reverts commit 1fb7c3512989311818af83d6aee246f171907a05.
Change-Id: Ib4c5815a06785cd876caa37acc0522adc26bc495
diff --git a/android/module.go b/android/module.go
index d7f0537..738f543 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1470,27 +1470,15 @@
var installDeps []*DepSet[InstallPath]
var packagingSpecs []*DepSet[PackagingSpec]
ctx.VisitDirectDeps(func(dep Module) {
- depTag := ctx.OtherModuleDependencyTag(dep)
- // If this is true, the direct outputs from the module is not gathered, but its
- // transitive deps are still gathered.
- skipToTransitive := IsSkipToTransitiveDepsTag(depTag)
- if isInstallDepNeeded(dep, depTag) || skipToTransitive {
+ if isInstallDepNeeded(dep, ctx.OtherModuleDependencyTag(dep)) {
// Installation is still handled by Make, so anything hidden from Make is not
// installable.
if !dep.IsHideFromMake() && !dep.IsSkipInstall() {
- if skipToTransitive {
- installDeps = append(installDeps, dep.base().installFilesDepSet.transitive...)
- } else {
- installDeps = append(installDeps, dep.base().installFilesDepSet)
- }
+ installDeps = append(installDeps, dep.base().installFilesDepSet)
}
// Add packaging deps even when the dependency is not installed so that uninstallable
// modules can still be packaged. Often the package will be installed instead.
- if skipToTransitive {
- packagingSpecs = append(packagingSpecs, dep.base().packagingSpecsDepSet.transitive...)
- } else {
- packagingSpecs = append(packagingSpecs, dep.base().packagingSpecsDepSet)
- }
+ packagingSpecs = append(packagingSpecs, dep.base().packagingSpecsDepSet)
}
})