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

Commit d0ea677d authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "Enable LOCAL_POST_LINK_CMD for non-static executables." am: 1f310530 

am: a72e7dbd

* commit 'a72e7dbd':
  Enable LOCAL_POST_LINK_CMD for non-static executables.
parents 6774f8b2 a72e7dbd

core/executable_internal.mk

+2 −1
Original line number Diff line number Diff line
@@ -70,15 +70,16 @@ $(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dyna 
$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o)

$(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o)

$(linked_module): PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)

$(linked_module): PRIVATE_POST_LINK_CMD := $(LOCAL_POST_LINK_CMD)



ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)

$(linked_module): PRIVATE_POST_LINK_CMD := $(LOCAL_POST_LINK_CMD)

$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o)

	$(transform-o-to-static-executable)

	$(PRIVATE_POST_LINK_CMD)

else

$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o)

	$(transform-o-to-executable)

	$(PRIVATE_POST_LINK_CMD)

endif



endif  # skip_build_from_source