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

Commit efc2f7cd authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

Merge "Add module type information to make modules." into main

parents 79158bd6 0762f5f0

core/base_rules.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

###########################################################

core/copy_headers.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

core/executable_internal.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

core/fuzz_test.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

core/header_library_internal.mk

+2 −0
Original line number Diff line number Diff line
@@ -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