From 2713018567078507a23f49d7ba407f052ff63d85 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 9 Dec 2024 16:43:03 -0800 Subject: 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. Bug: 382515940 Test: m event-log-tags Change-Id: Iae49e9924ac70f1ed0c141e21bc21c5d1974ef84 --- 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 b9cb0769a..cd3808c56 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -878,8 +878,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