From 2bb44365e732c935f2de3ed574f2abc3ae27cdeb Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Tue, 13 May 2014 17:51:47 +0800 Subject: dalvikvm: create the dalvikvm symlink to the primary version use executable_prefer_symlink.mk to create the dalvikvm symlink to the primary version of dalvikvm command. So that the modules call dalvikvm command don't need to change again. Change-Id: Ie5cefc26dc90fb56c35b6b9e4537eda126f61ea1 Signed-off-by: Yongqin Liu --- dalvikvm/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dalvikvm') diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index e99c76f..fd08263 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -27,10 +27,14 @@ LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_SHARED_LIBRARIES := libdl libnativehelper LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := dalvikvm +LOCAL_MODULE_STEM_32 := dalvikvm32 LOCAL_MODULE_STEM_64 := dalvikvm64 include art/build/Android.libcxx.mk include $(BUILD_EXECUTABLE) + +# create symlink for the primary version target. +include $(BUILD_SYSTEM)/executable_prefer_symlink.mk + ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE) ifeq ($(WITH_HOST_DALVIK),true) -- cgit v1.1