summaryrefslogtreecommitdiffstats
path: root/core/executable_internal.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-09-05 23:49:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-05 23:49:14 +0000
commitb9add847ee1eade4ff517655decfc1790bb77d60 (patch)
tree94a06f63c8c2ea2dc6b5701577cf70429be5695f /core/executable_internal.mk
parent2202dc0af3ab86e2a73bf816012aaea65fb93d91 (diff)
parent53e9502704bb492e0c387a21098f772f2aa60da9 (diff)
downloadbuild-b9add847ee1eade4ff517655decfc1790bb77d60.zip
build-b9add847ee1eade4ff517655decfc1790bb77d60.tar.gz
build-b9add847ee1eade4ff517655decfc1790bb77d60.tar.bz2
am 53e95027: Merge "Add LOCAL_POST_LINK_CMD."
* commit '53e9502704bb492e0c387a21098f772f2aa60da9': Add LOCAL_POST_LINK_CMD.
Diffstat (limited to 'core/executable_internal.mk')
-rw-r--r--core/executable_internal.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/executable_internal.mk b/core/executable_internal.mk
index 3d17eb0..762f8fe 100644
--- a/core/executable_internal.mk
+++ b/core/executable_internal.mk
@@ -64,8 +64,10 @@ $(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)
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)