From 617597c0fa1d10c2dc7dc2ad4eae3975b11b7f1c Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 8 Jun 2023 21:08:40 +0000 Subject: [PATCH 1/2] Trace build time by module name. Bug: http://b/259130368 Test: built, manually examined trace file to find module_name Change-Id: I2a20b60726e884ca82ba3244669d0257e9114222 --- core/base_rules.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/base_rules.mk b/core/base_rules.mk index c61c653bce..9ad1cc5251 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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) From fd5f1e75964d0d5631f33597daf1e6b50dccb2e4 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 8 Jun 2023 21:09:37 +0000 Subject: [PATCH 2/2] Trace time spent in cp rules for dist targets. Bug: http://b/259130368 Test: Used patched soong_trace.py to measure this Change-Id: Ic85e35ad17b18fb316770cdebc3e01f45edfab44 --- packaging/distdir.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/distdir.mk b/packaging/distdir.mk index c9508af323..153ecf65b1 100644 --- a/packaging/distdir.mk +++ b/packaging/distdir.mk @@ -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 $$@