Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44873191 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by Gerrit Code Review
Browse files

Merge "Fix dependencies around tools/*-event-log-tags.py"

parents 616f0869 d3ce14c3

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -434,9 +434,9 @@ all_event_log_tags_src := \ 
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)

$(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/tools/event_log_tags.py

	$(hide) mkdir -p $(dir $@)

	$(hide) build/tools/merge-event-log-tags.py -o $@ $(PRIVATE_SRC_FILES)

	$(hide) $(MERGETAGS) -o $@ $(PRIVATE_SRC_FILES)



# 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/
@@ -450,9 +450,9 @@ 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): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file)

$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/tools/event_log_tags.py

	$(hide) mkdir -p $(dir $@)

	$(hide) build/tools/merge-event-log-tags.py -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)

	$(hide) $(MERGETAGS) -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)



event-log-tags: $(event_log_tags_file)

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ DEFAULT_JACK_EXTRA_ARGS += --verbose error 


PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

MERGETAGS := build/tools/merge-event-log-tags.py

APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ endef 
define transform-logtags-to-java

@mkdir -p $(dir $@)

@echo "logtags: $@ <= $<"

$(hide) $(JAVATAGS) -o $@ $^

$(hide) $(JAVATAGS) -o $@ $< $(PRIVATE_MERGED_TAG)

endef

core/java.mk

+2 −1
Original line number Diff line number Diff line
@@ -354,7 +354,8 @@ ifneq ($(strip $(logtags_sources)),) 
logtags_java_sources := $(patsubst %.logtags,%.java,$(addprefix $(intermediates.COMMON)/src/, $(logtags_sources)))

logtags_sources := $(addprefix $(LOCAL_PATH)/, $(logtags_sources))



$(logtags_java_sources): $(intermediates.COMMON)/src/%.java: $(LOCAL_PATH)/%.logtags $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt

$(logtags_java_sources): PRIVATE_MERGED_TAG := $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt

$(logtags_java_sources): $(intermediates.COMMON)/src/%.java: $(LOCAL_PATH)/%.logtags $(TARGET_OUT_COMMON_INTERMEDIATES)/all-event-log-tags.txt $(JAVATAGS) build/tools/event_log_tags.py

	$(transform-logtags-to-java)



else