From 37e0bb0db43a9cfec4240da74996b67b0787941c Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 29 Apr 2024 15:54:44 +0900 Subject: Merge logtags from cc modules too Merged logtags files will be used for Soong built filesystem images. Bug: 336189540 Test: m out/soong/.intermediates/all-event-log-tags.txt Test: m out/target/common/obj/all-event-log-tags.txt Change-Id: Ib590c2bc8073e9acee6b45ef08092768237cf9d3 --- java/androidmk.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'java/androidmk.go') diff --git a/java/androidmk.go b/java/androidmk.go index a52d43965..ab5e456a4 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -92,11 +92,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { if len(library.logtagsSrcs) > 0 { - var logtags []string - for _, l := range library.logtagsSrcs { - logtags = append(logtags, l.Rel()) - } - entries.AddStrings("LOCAL_LOGTAGS_FILES", logtags...) + entries.AddStrings("LOCAL_SOONG_LOGTAGS_FILES", library.logtagsSrcs.Strings()...) } if library.installFile == nil { -- cgit v1.2.3-59-g8ed1b