From 0762f5f02a824554bd9d93ea1079ddf5eb950743 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Mon, 17 Jun 2024 14:32:45 -0700 Subject: [PATCH] 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 | 4 ++++ core/copy_headers.mk | 1 + core/executable_internal.mk | 2 ++ core/fuzz_test.mk | 2 ++ core/header_library_internal.mk | 2 ++ core/host_executable_internal.mk | 2 ++ core/host_java_library.mk | 2 ++ core/host_prebuilt.mk | 2 ++ core/host_shared_library_internal.mk | 2 ++ core/host_static_library_internal.mk | 2 ++ core/java_library.mk | 2 ++ core/multi_prebuilt.mk | 2 ++ core/native_test.mk | 2 ++ core/package_internal.mk | 2 ++ core/phony_package.mk | 2 ++ core/prebuilt_internal.mk | 2 ++ core/shared_library_internal.mk | 2 ++ core/static_java_library.mk | 2 ++ core/static_library_internal.mk | 2 ++ 19 files changed, 39 insertions(+) diff --git a/core/base_rules.mk b/core/base_rules.mk index 86028a909b..0d72903100 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -965,6 +965,8 @@ ALL_MODULES.$(my_register_name).BUILT := \ $(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 @@ $(LOCAL_MODULE)-$(h_or_hc_or_t)$(my_32_64_bit_suffix) : $(my_all_targets) 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 ########################################################### diff --git a/core/copy_headers.mk b/core/copy_headers.mk index 397ea629a9..2e82db7391 100644 --- a/core/copy_headers.mk +++ b/core/copy_headers.mk @@ -50,4 +50,5 @@ $(foreach header,$(LOCAL_COPY_HEADERS), \ _chFrom := _chTo := +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=COPY_HEADERS)) endif # LOCAL_COPY_HEADERS diff --git a/core/executable_internal.mk b/core/executable_internal.mk index fecf4f6a28..2a76c9d419 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -110,4 +110,6 @@ $(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE) $(LOCAL_BUILT_MODULE): $(my_coverage_path)/$(GCNO_ARCHIVE) endif +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=EXECUTABLE)) + endif # skip_build_from_source diff --git a/core/fuzz_test.mk b/core/fuzz_test.mk index 8a4b8c3d10..1181c661ce 100644 --- a/core/fuzz_test.mk +++ b/core/fuzz_test.mk @@ -43,3 +43,5 @@ LOCAL_STRIP_MODULE := keep_symbols endif include $(BUILD_EXECUTABLE) + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=FUZZ_TEST)) \ No newline at end of file diff --git a/core/header_library_internal.mk b/core/header_library_internal.mk index 35ee1bc032..a21c853562 100644 --- a/core/header_library_internal.mk +++ b/core/header_library_internal.mk @@ -19,3 +19,5 @@ endif $(LOCAL_BUILT_MODULE): $(hide) touch $@ + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=HEADER_LIBRARY)) \ No newline at end of file diff --git a/core/host_executable_internal.mk b/core/host_executable_internal.mk index 2ff9ff217a..7c79a1e4c6 100644 --- a/core/host_executable_internal.mk +++ b/core/host_executable_internal.mk @@ -57,4 +57,6 @@ $(LOCAL_BUILT_MODULE): $(my_crtbegin) $(my_crtend) $(my_libcrt_builtins) $(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) $(CLANG_CXX) $(transform-host-o-to-executable) +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=HOST_EXECUTABLE)) + endif # skip_build_from_source diff --git a/core/host_java_library.mk b/core/host_java_library.mk index d45da48c84..652eb0ef79 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -124,3 +124,5 @@ $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar) ifeq ($(TURBINE_ENABLED),false) $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar))) endif + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=HOST_JAVA_LIBRARY)) \ No newline at end of file diff --git a/core/host_prebuilt.mk b/core/host_prebuilt.mk index 79f3ffa23f..7dc6704e8b 100644 --- a/core/host_prebuilt.mk +++ b/core/host_prebuilt.mk @@ -17,3 +17,5 @@ $(call record-module-type,HOST_PREBUILT) LOCAL_IS_HOST_MODULE := true include $(BUILD_MULTI_PREBUILT) + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=HOST_PREBUILT)) \ No newline at end of file diff --git a/core/host_shared_library_internal.mk b/core/host_shared_library_internal.mk index ae8b798c3c..22a02d45bd 100644 --- a/core/host_shared_library_internal.mk +++ b/core/host_shared_library_internal.mk @@ -53,4 +53,6 @@ $(LOCAL_BUILT_MODULE): \ $(LOCAL_ADDITIONAL_DEPENDENCIES) $(transform-host-o-to-shared-lib) +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=HOST_SHARED_LIBRARY)) + endif # skip_build_from_source diff --git a/core/host_static_library_internal.mk b/core/host_static_library_internal.mk index 3946aa7bc9..079c45eb98 100644 --- a/core/host_static_library_internal.mk +++ b/core/host_static_library_internal.mk @@ -23,3 +23,5 @@ include $(BUILD_SYSTEM)/binary.mk $(LOCAL_BUILT_MODULE): $(built_whole_libraries) $(LOCAL_BUILT_MODULE): $(all_objects) $(transform-host-o-to-static-lib) + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=HOST_STATIC_LIBRARY)) \ No newline at end of file diff --git a/core/java_library.mk b/core/java_library.mk index 3ac03dc085..97ce92c413 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -88,3 +88,5 @@ endif # LOCAL_UNCOMPRESS_DEX $(eval $(call copy-one-file,$(common_javalib.jar),$(LOCAL_BUILT_MODULE))) endif # !LOCAL_IS_STATIC_JAVA_LIBRARY + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=JAVA_LIBRARY)) \ No newline at end of file diff --git a/core/multi_prebuilt.mk b/core/multi_prebuilt.mk index c97d481f58..415401b3ca 100644 --- a/core/multi_prebuilt.mk +++ b/core/multi_prebuilt.mk @@ -132,3 +132,5 @@ prebuilt_java_libraries := prebuilt_static_java_libraries := prebuilt_is_host := prebuilt_module_tags := + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=MULTI_PREBUILT)) \ No newline at end of file diff --git a/core/native_test.mk b/core/native_test.mk index 8b49fbde10..c12b211467 100644 --- a/core/native_test.mk +++ b/core/native_test.mk @@ -21,3 +21,5 @@ endif endif include $(BUILD_EXECUTABLE) + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=NATIVE_TEST)) \ No newline at end of file diff --git a/core/package_internal.mk b/core/package_internal.mk index a03a62b7fa..a7eb57218f 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -731,3 +731,5 @@ ifneq (,$(runtime_resource_overlays_product)$(runtime_resource_overlays_vendor)) ) endif endif + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=PACKAGE)) \ No newline at end of file diff --git a/core/phony_package.mk b/core/phony_package.mk index 578d629789..c978793e2e 100644 --- a/core/phony_package.mk +++ b/core/phony_package.mk @@ -12,3 +12,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Fake: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=PHONY_PACKAGE)) \ No newline at end of file diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 94626402c9..d5261f4cfc 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -63,3 +63,5 @@ $(if $(filter-out $(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE)), \ $(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) my_prebuilt_src_file := + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=PREBUILT)) \ No newline at end of file diff --git a/core/shared_library_internal.mk b/core/shared_library_internal.mk index 2f510d9b30..ae34cb887d 100644 --- a/core/shared_library_internal.mk +++ b/core/shared_library_internal.mk @@ -101,4 +101,6 @@ $(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE) $(LOCAL_BUILT_MODULE): $(my_coverage_path)/$(GCNO_ARCHIVE) endif +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=SHARED_LIBRARY)) + endif # skip_build_from_source diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 4a72a1fc31..dd1d8b5280 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -229,3 +229,5 @@ endif # need_compile_res aar_classes_jar := all_res_assets := LOCAL_IS_STATIC_JAVA_LIBRARY := + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=STATIC_JAVA_LIBRARY)) \ No newline at end of file diff --git a/core/static_library_internal.mk b/core/static_library_internal.mk index 039246098f..844360e52d 100644 --- a/core/static_library_internal.mk +++ b/core/static_library_internal.mk @@ -41,3 +41,5 @@ $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries) $(package-coverage-files) endif + +$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=STATIC_LIBRARY)) \ No newline at end of file