From 7f722b366aad52000465818ffbdc880676be9aae Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 9 Jun 2014 16:32:51 -0700 Subject: Use PRIVATE_POST_INSTALL_CMD to create symlink. Bug: 15520908 Change-Id: Ib3349f7adb6def81abf07bfb9d37093e4a599d09 --- tests/Android.mk | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index 25f8b2b..56b1ef1 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -258,27 +258,13 @@ include $(LOCAL_PATH)/Android.build.mk # ----------------------------------------------------------------------------- # create symlink to libdlext_test.so for symlink test # ----------------------------------------------------------------------------- -libdlext_origin := $(LOCAL_INSTALLED_MODULE) -libdlext_sym := $(subst libdlext_test,libdlext_test_v2,$(libdlext_origin)) -$(libdlext_sym): $(libdlext_origin) - @echo "Symlink: $@ -> $(notdir $<)" - @mkdir -p $(dir $@) - $(hide) ln -sf $(notdir $<) $@ - -ALL_MODULES := \ - $(ALL_MODULES) $(libdlext_sym) - +# Use = instead of := to defer the evaluation of $@ +$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD = \ + $(hide) cd $(dir $@) && ln -sf $(notdir $@) libdlext_test_v2.so ifneq ($(TARGET_2ND_ARCH),) # link 64 bit .so -libdlext_origin := $(TARGET_OUT)/lib64/libdlext_test.so -libdlext_sym := $(subst libdlext_test,libdlext_test_v2,$(libdlext_origin)) -$(libdlext_sym): $(libdlext_origin) - @echo "Symlink: $@ -> $(notdir $<)" - @mkdir -p $(dir $@) - $(hide) ln -sf $(notdir $<) $@ - -ALL_MODULES := \ - $(ALL_MODULES) $(libdlext_sym) +$(TARGET_OUT)/lib64/libdlext_test.so: PRIVATE_POST_INSTALL_CMD = \ + $(hide) cd $(dir $@) && ln -sf $(notdir $@) libdlext_test_v2.so endif libdlext_test_norelro_src_files := \ -- cgit v1.1