diff options
| author | Doug Zongker <dougz@android.com> | 2011-02-23 13:34:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-23 13:34:59 -0800 |
| commit | 419e19121ccd6f45b1f039e7ba87d74fc8798b79 (patch) | |
| tree | 881d6021460162aa0a39d629ffdd81d95e04db2a | |
| parent | ca855e9c0a8480e617bd0ee59a99f406fc5ae757 (diff) | |
| parent | 5e2afb977fcec46e001ac57cc76d3b9534696afa (diff) | |
| download | build-419e19121ccd6f45b1f039e7ba87d74fc8798b79.zip build-419e19121ccd6f45b1f039e7ba87d74fc8798b79.tar.gz build-419e19121ccd6f45b1f039e7ba87d74fc8798b79.tar.bz2 | |
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
| -rw-r--r-- | core/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index c17b4eb..1d3110d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -285,12 +285,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) |