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

Commit 7e9a4af0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Reapply "Remove unassigned event log tags feature"" into main

parents fad1e47d 0585bb1b

core/Makefile

+3 −18
Original line number Diff line number Diff line
@@ -970,27 +970,12 @@ systemimage: 


# -----------------------------------------------------------------



.PHONY: event-log-tags



# Produce an event logs tag file for everything we know about, in order

# to properly allocate numbers.  Then produce a file that's filtered

# for what's going to be installed.



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

all_event_log_tags_src := \

    $(sort $(foreach m, $(ALL_MODULES), $(ALL_MODULES.$(m).EVENT_LOG_TAGS)))



$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src)

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

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

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



$(call declare-0p-target,$(all_event_log_tags_file))



# 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).
@@ -1002,13 +987,13 @@ 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_MERGED_FILE := $(all_event_log_tags_file)

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

$(event_log_tags_file): $(event_log_tags_src) $(MERGETAGS)

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

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

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



$(eval $(call declare-0p-target,$(event_log_tags_file)))



.PHONY: event-log-tags

event-log-tags: $(event_log_tags_file)



ALL_DEFAULT_INSTALLED_MODULES += $(event_log_tags_file)

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -730,8 +730,8 @@ SYMBOLS_MAP := $(HOST_OUT_EXECUTABLES)/symbols_map 
PROGUARD_HOME := external/proguard

PROGUARD := $(PROGUARD_HOME)/bin/proguard.sh

PROGUARD_DEPS := $(PROGUARD) $(PROGUARD_HOME)/lib/proguard.jar

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

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

JAVATAGS := $(HOST_OUT_EXECUTABLES)/java-event-log-tags

MERGETAGS := $(HOST_OUT_EXECUTABLES)/merge-event-log-tags

APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg

VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_METADATA := $(HOST_OUT_EXECUTABLES)/build_verity_metadata

core/definitions.mk

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

@mkdir -p $(dir $@)

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

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

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

endef

core/java.mk

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

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



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

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

$(logtags_java_sources): $(intermediates.COMMON)/logtags/%.java: $(LOCAL_PATH)/%.logtags $(JAVATAGS)

	$(transform-logtags-to-java)



else

tools/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -123,3 +123,11 @@ python_binary_host { 
        "merge-event-log-tags.py",

    ],

}



python_binary_host {

    name: "java-event-log-tags",

    srcs: [

        "event_log_tags.py",

        "java-event-log-tags.py",

    ],

}