diff options
| author | 2025-02-11 21:25:51 -0800 | |
|---|---|---|
| committer | 2025-02-11 21:25:51 -0800 | |
| commit | 90273ac3c1eaa0d0ba9e3a0eafe964b6cdd2f5eb (patch) | |
| tree | a31f6d7458ce40a5882d9de31fa80d4e9cd7d354 /phony | |
| parent | 3774aa9dec6daa36ba996e185273031940a359b4 (diff) | |
Revert^2 "Allow phony modules to depend on outputs"
This reverts commit 3774aa9dec6daa36ba996e185273031940a359b4.
Reason for revert: build breakage fixed with ag/31698286
Change-Id: I4d7cb7c32fc8f9a07e67dfaa6d111b120c0083f6
Diffstat (limited to 'phony')
| -rw-r--r-- | phony/phony.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/phony/phony.go b/phony/phony.go index 807b95b32..4f61c4583 100644 --- a/phony/phony.go +++ b/phony/phony.go @@ -38,9 +38,11 @@ var PrepareForTestWithPhony = android.FixtureRegisterWithContext(registerPhonyMo type phony struct { android.ModuleBase + requiredModuleNames []string hostRequiredModuleNames []string targetRequiredModuleNames []string + outputDeps android.Paths } func PhonyFactory() android.Module { @@ -54,6 +56,14 @@ func (p *phony) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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 { @@ -77,6 +87,10 @@ func (p *phony) AndroidMk() android.AndroidMkData { 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) |