Merge changes from topic "merge_cc_logtags" into main
* changes: Add LOCAL_SOONG_LOGTAGS_FILES Add python Soong modules for logtags
This commit is contained in:
commit
ab47e15dd1
3 changed files with 11 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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 :=
|
||||
|
|
|
@ -115,3 +115,11 @@ python_binary_host {
|
|||
},
|
||||
},
|
||||
}
|
||||
|
||||
python_binary_host {
|
||||
name: "merge-event-log-tags",
|
||||
srcs: [
|
||||
"event_log_tags.py",
|
||||
"merge-event-log-tags.py",
|
||||
],
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue