Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beff4ab9 authored by Inseob Kim's avatar Inseob Kim
Browse files

Add LOCAL_SOONG_LOGTAGS_FILES 

LOCAL_SOONG_LOGTAGS_FILES is similar to LOCAL_LOGTAGS_FILES but it uses
full paths rather than relative paths, to correctly support Soong's
`android:"path"` which may produce paths outside module directories.

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: I129b96f3e06036ded76d2657e25e895f8c946cfb
parent f441f7d8

core/base_rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ endif 


logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES)) $(LOCAL_LOGTAGS_FILES)



ifneq ($(strip $(logtags_sources)),)

event_log_tags := $(foreach f,$(addprefix $(LOCAL_PATH)/,$(logtags_sources)),$(call clean-path,$(f)))

ifneq ($(strip $(logtags_sources) $(LOCAL_SOONG_LOGTAGS_FILES)),)

event_log_tags := $(foreach f,$(LOCAL_SOONG_LOGTAGS_FILES) $(addprefix $(LOCAL_PATH)/,$(logtags_sources)),$(call clean-path,$(f)))

else

event_log_tags :=

endif

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR := 
LOCAL_SOONG_LICENSE_METADATA :=

LOCAL_SOONG_LINK_TYPE :=

LOCAL_SOONG_LINT_REPORTS :=

LOCAL_SOONG_LOGTAGS_FILES :=

LOCAL_SOONG_MODULE_INFO_JSON :=

LOCAL_SOONG_MODULE_TYPE :=

LOCAL_SOONG_PROGUARD_DICT :=