am 199e8638: Merge "Use PRIVATE_POST_INSTALL_CMD to create symlink."

* commit '199e8638df12eb6373771ebb59a1f5a83c6de1cc':
  Use PRIVATE_POST_INSTALL_CMD to create symlink.
This commit is contained in:
Ying Wang 2014-06-10 00:00:45 +00:00 committed by Android Git Automerger
commit c3064d2772

View File

@ -258,27 +258,13 @@ include $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# create symlink to libdlext_test.so for symlink test # create symlink to libdlext_test.so for symlink test
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libdlext_origin := $(LOCAL_INSTALLED_MODULE) # Use = instead of := to defer the evaluation of $@
libdlext_sym := $(subst libdlext_test,libdlext_test_v2,$(libdlext_origin)) $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD = \
$(libdlext_sym): $(libdlext_origin) $(hide) cd $(dir $@) && ln -sf $(notdir $@) libdlext_test_v2.so
@echo "Symlink: $@ -> $(notdir $<)"
@mkdir -p $(dir $@)
$(hide) ln -sf $(notdir $<) $@
ALL_MODULES := \
$(ALL_MODULES) $(libdlext_sym)
ifneq ($(TARGET_2ND_ARCH),) ifneq ($(TARGET_2ND_ARCH),)
# link 64 bit .so # link 64 bit .so
libdlext_origin := $(TARGET_OUT)/lib64/libdlext_test.so $(TARGET_OUT)/lib64/libdlext_test.so: PRIVATE_POST_INSTALL_CMD = \
libdlext_sym := $(subst libdlext_test,libdlext_test_v2,$(libdlext_origin)) $(hide) cd $(dir $@) && ln -sf $(notdir $@) libdlext_test_v2.so
$(libdlext_sym): $(libdlext_origin)
@echo "Symlink: $@ -> $(notdir $<)"
@mkdir -p $(dir $@)
$(hide) ln -sf $(notdir $<) $@
ALL_MODULES := \
$(ALL_MODULES) $(libdlext_sym)
endif endif
libdlext_test_norelro_src_files := \ libdlext_test_norelro_src_files := \