From a34fa95c164a9388ed0b84b17a63241bffd4132a Mon Sep 17 00:00:00 2001
From: Doug Zongker <dougz@android.com>
Date: Wed, 23 Feb 2011 12:17:29 -0800
Subject: [PATCH] force inclusion of system log tags in the event-log-tags file

Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
---
 core/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 72d4ae799..d5fd9a8fb 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -277,12 +277,15 @@ $(all_event_log_tags_file): $(all_event_log_tags_src)
 
 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)