diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-16 12:18:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-16 12:18:10 +0000 |
| commit | 701318227c322f78a7cb466961b9a058e91a7eb9 (patch) | |
| tree | 1e84513a05c7351d1ff2d06e509fb43304455d0b /dalvikvm | |
| parent | c006db38389748e5fa9508c4ef32cc57fd68a014 (diff) | |
| parent | 2bb44365e732c935f2de3ed574f2abc3ae27cdeb (diff) | |
| download | art-701318227c322f78a7cb466961b9a058e91a7eb9.zip art-701318227c322f78a7cb466961b9a058e91a7eb9.tar.gz art-701318227c322f78a7cb466961b9a058e91a7eb9.tar.bz2 | |
Merge "dalvikvm: create the dalvikvm symlink to the primary version"
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 8076b61..e7ed9a7 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -28,10 +28,14 @@ LOCAL_C_INCLUDES := art/runtime 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) |