Merge event-log-tags from platform.zip with local *.logtags
PDK fusion builds will include system/etc/event-log-tags from a full build from platform.zip, which needs to be merged into the event-log-tags built locally based on *.logtags from projects that have source. Bug: 6297675 Change-Id: I91409f37c6dc88d6942eade2946155c2a6640b6f
This commit is contained in:
parent
162a817521
commit
dc8f8e4a75
1 changed files with 10 additions and 7 deletions
|
@ -300,18 +300,21 @@ systemimage:
|
||||||
|
|
||||||
all_event_log_tags_file := $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt
|
all_event_log_tags_file := $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt
|
||||||
|
|
||||||
|
event_log_tags_file := $(TARGET_OUT)/etc/event-log-tags
|
||||||
|
|
||||||
# Include tags from all packages that we know about
|
# Include tags from all packages that we know about
|
||||||
all_event_log_tags_src := \
|
all_event_log_tags_src := \
|
||||||
$(sort $(foreach m, $(ALL_MODULES), $(ALL_MODULES.$(m).EVENT_LOG_TAGS)))
|
$(sort $(foreach m, $(ALL_MODULES), $(ALL_MODULES.$(m).EVENT_LOG_TAGS)))
|
||||||
|
|
||||||
$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src)
|
# PDK builds will already have a full list of tags that needs to get merged
|
||||||
$(all_event_log_tags_file): $(all_event_log_tags_src)
|
# in with the ones from source
|
||||||
|
pdk_fusion_log_tags_file := $(patsubst $(PRODUCT_OUT)/%,$(_pdk_fusion_intermediates)/%,$(filter $(event_log_tags_file),$(ALL_PDK_FUSION_FILES)))
|
||||||
|
|
||||||
|
$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src) $(pdk_fusion_log_tags_file)
|
||||||
|
$(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file)
|
||||||
$(hide) mkdir -p $(dir $@)
|
$(hide) mkdir -p $(dir $@)
|
||||||
$(hide) build/tools/merge-event-log-tags.py -o $@ $(PRIVATE_SRC_FILES)
|
$(hide) build/tools/merge-event-log-tags.py -o $@ $(PRIVATE_SRC_FILES)
|
||||||
|
|
||||||
|
|
||||||
event_log_tags_file := $(TARGET_OUT)/etc/event-log-tags
|
|
||||||
|
|
||||||
# Include tags from all packages included in this product, plus all
|
# 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/
|
# tags that are part of the system (ie, not in a vendor/ or device/
|
||||||
# directory).
|
# directory).
|
||||||
|
@ -322,9 +325,9 @@ event_log_tags_src := \
|
||||||
$(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \
|
$(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \
|
||||||
$(filter-out vendor/% device/% out/%,$(all_event_log_tags_src)))
|
$(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_SRC_FILES := $(event_log_tags_src) $(pdk_fusion_log_tags_file)
|
||||||
$(event_log_tags_file): PRIVATE_MERGED_FILE := $(all_event_log_tags_file)
|
$(event_log_tags_file): PRIVATE_MERGED_FILE := $(all_event_log_tags_file)
|
||||||
$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file)
|
$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file)
|
||||||
$(hide) mkdir -p $(dir $@)
|
$(hide) mkdir -p $(dir $@)
|
||||||
$(hide) build/tools/merge-event-log-tags.py -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)
|
$(hide) build/tools/merge-event-log-tags.py -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue