Revert "Allow phony modules to depend on outputs"
This reverts commit 0bc5384d2ad379db13ef7ccc5c3eb30c35113d87.
Reason for revert: breaking internal build
Change-Id: I115648c1124ed6d4feed94e1796afd8ac3aea54c
diff --git a/phony/phony.go b/phony/phony.go
index 4f61c45..807b95b 100644
--- a/phony/phony.go
+++ b/phony/phony.go
@@ -38,11 +38,9 @@
type phony struct {
android.ModuleBase
-
requiredModuleNames []string
hostRequiredModuleNames []string
targetRequiredModuleNames []string
- outputDeps android.Paths
}
func PhonyFactory() android.Module {
@@ -56,14 +54,6 @@
p.requiredModuleNames = ctx.RequiredModuleNames(ctx)
p.hostRequiredModuleNames = ctx.HostRequiredModuleNames()
p.targetRequiredModuleNames = ctx.TargetRequiredModuleNames()
-
- ctx.VisitDirectDepsWithTag(android.RequiredDepTag, func(dep android.Module) {
- if o, ok := android.OtherModuleProvider(ctx, dep, android.OutputFilesProvider); ok {
- p.outputDeps = append(p.outputDeps, o.DefaultOutputFiles...)
- }
- })
-
- ctx.Phony(p.Name(), p.outputDeps...)
}
func (p *phony) AndroidMk() android.AndroidMkData {
@@ -87,10 +77,6 @@
fmt.Fprintln(w, "LOCAL_TARGET_REQUIRED_MODULES :=",
strings.Join(p.targetRequiredModuleNames, " "))
}
- if len(p.outputDeps) > 0 {
- fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES :=",
- strings.Join(p.outputDeps.Strings(), " "))
- }
// AconfigUpdateAndroidMkData may have added elements to Extra. Process them here.
for _, extra := range data.Extra {
extra(w, nil)