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

Commit d3bcae72 authored by Dan Albert's avatar Dan Albert Committed by Automerger Merge Worker
Browse files

Merge changes from topic "module-rule-tracing" am: ef530fdf 

Original change: https://android-review.googlesource.com/c/platform/build/+/2617860



Change-Id: I2668f18a1b4a61574afb3e8dc518bfb87c19c34e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents abecf30a ef530fdf

core/base_rules.mk

+6 −0
Original line number Diff line number Diff line
@@ -450,6 +450,12 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH) 
$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_IS_HOST_MODULE := $(LOCAL_IS_HOST_MODULE)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_HOST:= $(my_host)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PREFIX := $(my_prefix)

$(LOCAL_INTERMEDIATE_TARGETS) : .KATI_TAGS += ;module_name=$(LOCAL_MODULE)

ifeq ($(LOCAL_MODULE_CLASS),)

$(error "$(LOCAL_MODULE) in $(LOCAL_PATH) does not set $(LOCAL_MODULE_CLASS)")

else

$(LOCAL_INTERMEDIATE_TARGETS) : .KATI_TAGS += ;module_type=$(LOCAL_MODULE_CLASS)

endif



$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_INTERMEDIATES_DIR:= $(intermediates)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX)

packaging/distdir.mk

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ $(foreach pair,$(DIST_GOAL_OUTPUT_PAIRS), \ 
    $(eval _dist_$$(goal):)))



define copy-one-dist-file

$(2): .KATI_TAGS += ;rule_name=dist-cp

$(2): $(1)

	@echo "Dist: $$@"

	rm -f $$@