From bd20ac15ddecd33832318e2d158a2dcc129a22c1 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 10 Dec 2024 12:30:44 -0800 Subject: Reapply "Remove unassigned event log tags feature" .logtags files are a mapping of an integer -> name. However, there is an unused feature where you could put a '?' instead of an integer, and then the build system would assign a number to it, taking care to avoid all other already-assigned numbers across the source tree. This feature makes it hard to support some things we're working towards, like incremental soong and treble common system images, so remove it. Also modernize the python scripts a little. The additions since the revert are the cleanups from aosp/3403019, and removing a missed reference to all-event-log-tags.txt in java.mk. This reverts commit 078347368de279b41a37b3599e24e60014892fef. Bug: 382515940 Test: m event-log-tags Change-Id: I8f08f3286f1275083e2074948f2feb39219f3687 --- filesystem/filesystem.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 81afd02b4..9ad2cc9bc 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -882,8 +882,7 @@ 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()). - FlagWithInput("-m ", android.MergedLogtagsPath(ctx)) + FlagWithArg("-o ", eventLogtagsPath.String()) for _, path := range android.SortedKeys(logtagsFilePaths) { cmd.Text(path) -- cgit v1.2.3-59-g8ed1b