commit 0762f5f02a824554bd9d93ea1079ddf5eb950743
author Wei Li <weiwli@google.com> Mon Jun 17 14:32:45 2024 -0700
committer Wei Li <weiwli@google.com> Mon Jun 17 21:53:27 2024 +0000
tree 5f159a815435a343d568350b075538780787b1fe
parent a96b36bd9f34ad33e516fb731874df22879a546b

Add module type information to make modules.

To be paired with $(call record-module-type)

Bug: 324465531
Test: CIs
Change-Id: Ie1649093e299c43a2642fb9d27a0a56b1c8e40c1

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 86028a9..0d72903 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -965,6 +965,8 @@
     $(ALL_MODULES.$(my_register_name).BUILT) $(LOCAL_BUILT_MODULE)
 ALL_MODULES.$(my_register_name).SOONG_MODULE_TYPE := \
     $(ALL_MODULES.$(my_register_name).SOONG_MODULE_TYPE) $(LOCAL_SOONG_MODULE_TYPE)
+ALL_MODULES.$(my_register_name).IS_SOONG_MODULE := \
+    $(if $(filter $(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)),true)
 ifndef LOCAL_IS_HOST_MODULE
 ALL_MODULES.$(my_register_name).TARGET_BUILT := \
     $(ALL_MODULES.$(my_register_name).TARGET_BUILT) $(LOCAL_BUILT_MODULE)
@@ -1266,6 +1268,8 @@
 endif
 endif
 
+$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=base_rules))
+
 ###########################################################
 # Ensure privileged applications always have LOCAL_PRIVILEGED_MODULE
 ###########################################################