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

Commit bf4a8d30 authored by Ying Wang's avatar Ying Wang
Browse files

Include $(BUILD_COPY_HEADERS) in upper-level makefiles 

This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.

Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce
parent 9335001d

core/binary.mk

+0 −6
Original line number Diff line number Diff line
@@ -717,12 +717,6 @@ $(normal_objects) : | $(my_generated_sources) 
$(all_objects) : | $(import_includes)

ALL_C_CPP_ETC_OBJECTS += $(all_objects)



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

## Copy headers to the install tree

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

ifndef LOCAL_2ND_ARCH_VAR_PREFIX

include $(BUILD_COPY_HEADERS)

endif



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

# Standard library handling.

core/host_shared_library.mk

+5 −0
Original line number Diff line number Diff line
@@ -44,3 +44,8 @@ $(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) $(LOCAL_ADDITIONAL_DEPEND 
	$(transform-host-o-to-shared-lib)



endif  # skip_build_from_source



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

## Copy headers to the install tree

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

include $(BUILD_COPY_HEADERS)

core/host_static_library.mk

+5 −0
Original line number Diff line number Diff line
@@ -25,3 +25,8 @@ include $(BUILD_SYSTEM)/binary.mk 
$(LOCAL_BUILT_MODULE): $(built_whole_libraries)

$(LOCAL_BUILT_MODULE): $(all_objects)

	$(transform-host-o-to-static-lib)



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

## Copy headers to the install tree

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

include $(BUILD_COPY_HEADERS)

core/shared_library.mk

+5 −0
Original line number Diff line number Diff line
@@ -41,3 +41,8 @@ LOCAL_2ND_ARCH_VAR_PREFIX := 
endif # TARGET_2ND_ARCH



my_module_arch_supported :=



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

## Copy headers to the install tree

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

include $(BUILD_COPY_HEADERS)

core/static_library.mk

+5 −0
Original line number Diff line number Diff line
@@ -29,3 +29,8 @@ LOCAL_2ND_ARCH_VAR_PREFIX := 
endif # TARGET_2ND_ARCH



my_module_arch_supported :=



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

## Copy headers to the install tree

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

include $(BUILD_COPY_HEADERS)