summaryrefslogtreecommitdiffstats
path: root/core/executable_internal.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-09-05 23:54:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-05 23:54:29 +0000
commit781da0400102be46590b8f97b5cdc14f2bbe8f1e (patch)
treea6d4523cf123e05f5cce7129c359bbaa24334a4b /core/executable_internal.mk
parent36ebce8f44fdbf26904e9b5bc909538f6561ba7a (diff)
parentb9add847ee1eade4ff517655decfc1790bb77d60 (diff)
downloadbuild-781da0400102be46590b8f97b5cdc14f2bbe8f1e.zip
build-781da0400102be46590b8f97b5cdc14f2bbe8f1e.tar.gz
build-781da0400102be46590b8f97b5cdc14f2bbe8f1e.tar.bz2
am b9add847: am 53e95027: Merge "Add LOCAL_POST_LINK_CMD."
* commit 'b9add847ee1eade4ff517655decfc1790bb77d60': 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 9325287..dd231e3 100644
--- a/core/executable_internal.mk
+++ b/core/executable_internal.mk
@@ -62,8 +62,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)