diff options
| author | 2025-03-05 14:30:01 -0800 | |
|---|---|---|
| committer | 2025-03-05 14:30:01 -0800 | |
| commit | eff7c4cc6a102cc9ff7bcc6f21eced70263fec13 (patch) | |
| tree | 885d205b6d48f6143bd02d9343fdc808f96b6bd5 /android/module.go | |
| parent | 45759f4cc00076b04c8ed3abbd06b93cbf810c66 (diff) | |
| parent | f31b68dc70de41a7b4b25d611a2962714e7f921f (diff) | |
Merge "Fix -host and -target phonies building both variants" into main am: b31c77b9b8 am: f31b68dc70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3528872
Change-Id: Ie6ea4d3ec8ac1d56c49409249e47d2aae0650abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android/module.go b/android/module.go index 713751a71..545753973 100644 --- a/android/module.go +++ b/android/module.go @@ -1669,9 +1669,10 @@ func (m *ModuleBase) generateModuleTarget(ctx *moduleContext) { if len(ctx.installFiles) > 0 { name := namespacePrefix + ctx.ModuleName() + "-install" - ctx.Phony(name, ctx.installFiles.Paths()...) + installFiles := ctx.installFiles.Paths() + ctx.Phony(name, installFiles...) info.InstallTarget = PathForPhony(ctx, name) - deps = append(deps, info.InstallTarget) + deps = append(deps, installFiles...) } // A module's -checkbuild phony targets should @@ -1681,13 +1682,13 @@ func (m *ModuleBase) generateModuleTarget(ctx *moduleContext) { if (!ctx.Config().KatiEnabled() || !shouldSkipAndroidMkProcessing(ctx, m)) && !ctx.uncheckedModule && ctx.checkbuildTarget != nil { name := namespacePrefix + ctx.ModuleName() + "-checkbuild" ctx.Phony(name, ctx.checkbuildTarget) - deps = append(deps, PathForPhony(ctx, name)) + deps = append(deps, ctx.checkbuildTarget) } if outputFiles, err := outputFilesForModule(ctx, ctx.Module(), ""); err == nil && len(outputFiles) > 0 { name := namespacePrefix + ctx.ModuleName() + "-outputs" ctx.Phony(name, outputFiles...) - deps = append(deps, PathForPhony(ctx, name)) + deps = append(deps, outputFiles...) } if len(deps) > 0 { |