summaryrefslogtreecommitdiff
path: root/filesystem/filesystem.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-12-10 20:25:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-12-10 20:25:24 +0000
commitdd7ac83fdaae8b8f0b61ac4bae1cc3c258b9629b (patch)
tree3367eeded767147aaddf4086635d7bcf48a2a3cd /filesystem/filesystem.go
parent3747221ade705fbd54cd575a53d060f22de38b0d (diff)
parent078347368de279b41a37b3599e24e60014892fef (diff)
Merge "Revert "Remove unassigned event log tags feature"" into main
Diffstat (limited to 'filesystem/filesystem.go')
-rw-r--r--filesystem/filesystem.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index 9ad2cc9bc..81afd02b4 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -882,7 +882,8 @@ func (f *filesystem) buildEventLogtagsFile(ctx android.ModuleContext, builder *a
eventLogtagsPath := etcPath.Join(ctx, "event-log-tags")
builder.Command().Text("mkdir").Flag("-p").Text(etcPath.String())
cmd := builder.Command().BuiltTool("merge-event-log-tags").
- FlagWithArg("-o ", eventLogtagsPath.String())
+ FlagWithArg("-o ", eventLogtagsPath.String()).
+ FlagWithInput("-m ", android.MergedLogtagsPath(ctx))
for _, path := range android.SortedKeys(logtagsFilePaths) {
cmd.Text(path)