am 5e2afb97: am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit '5e2afb977fcec46e001ac57cc76d3b9534696afa':
force inclusion of system log tags in the event-log-tags file
diff --git a/core/Makefile b/core/Makefile
index c17b4eb..1d3110d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -285,12 +285,15 @@
event_log_tags_file := $(TARGET_OUT)/etc/event-log-tags
-# Include tags from all packages included in this product.
+# Include tags from all packages included in this product, plus all
+# tags that are part of the system (ie, not in a vendor/ or device/
+# directory).
event_log_tags_src := \
$(sort $(foreach m,\
$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES) \
$(call module-names-for-tag-list,user), \
- $(ALL_MODULES.$(m).EVENT_LOG_TAGS)))
+ $(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \
+ $(filter-out vendor/% device/% out/%,$(all_event_log_tags_src)))
$(event_log_tags_file): PRIVATE_SRC_FILES := $(event_log_tags_src)
$(event_log_tags_file): PRIVATE_MERGED_FILE := $(all_event_log_tags_file)