diff options
| author | Ying Wang <wangying@google.com> | 2014-06-09 23:55:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-09 23:55:19 +0000 |
| commit | 199e8638df12eb6373771ebb59a1f5a83c6de1cc (patch) | |
| tree | 32e0b7ef431446ec534cd3ecf1817e348de65092 | |
| parent | 87d4233c7224201b1199179b11c5c5f854ab36a3 (diff) | |
| parent | 7f722b366aad52000465818ffbdc880676be9aae (diff) | |
| download | bionic-199e8638df12eb6373771ebb59a1f5a83c6de1cc.zip bionic-199e8638df12eb6373771ebb59a1f5a83c6de1cc.tar.gz bionic-199e8638df12eb6373771ebb59a1f5a83c6de1cc.tar.bz2 | |
Merge "Use PRIVATE_POST_INSTALL_CMD to create symlink."
| -rw-r--r-- | tests/Android.mk | 24 |
1 files 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 := \ |