From e4506afe9850164b561f4d6e0edc0a34b502cdd3 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 11 Dec 2024 14:14:50 -0800 Subject: Make soong's event-log-tags file match make Make included all event-log-tags in the source tree, wether or not they were installed on the device. Soong was only including files from the deps of the system image. In the long run, we'll want a per-partition event-log-tags file for incremental soong and an independant treble system image. But this works for now. Bug: 382515940 Test: diff out/target/product/vsoc_x86_64/system/etc/event-log-tags out/soong/.intermediates/build/soong/fsgen/aosp_cf_x86_64_phone_generated_system_image/android_common/root/system/etc/event-log-tags Change-Id: Id631c4292dda9531df3e460ef736fd9b15f6b566 --- filesystem/filesystem.go | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 1d32b8f70..6d673e31d 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -868,29 +868,10 @@ func (f *filesystem) buildEventLogtagsFile(ctx android.ModuleContext, builder *a return } - logtagsFilePaths := make(map[string]bool) - ctx.WalkDeps(func(child, parent android.Module) bool { - if logtagsInfo, ok := android.OtherModuleProvider(ctx, child, android.LogtagsProviderKey); ok { - for _, path := range logtagsInfo.Logtags { - logtagsFilePaths[path.String()] = true - } - } - return true - }) - - if len(logtagsFilePaths) == 0 { - return - } - etcPath := rebasedDir.Join(ctx, "etc") 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()) - - for _, path := range android.SortedKeys(logtagsFilePaths) { - cmd.Text(path) - } + builder.Command().Text("cp").Input(android.MergedLogtagsPath(ctx)).Text(eventLogtagsPath.String()) f.appendToEntry(ctx, eventLogtagsPath) } -- cgit v1.2.3-59-g8ed1b