diff options
| author | 2014-06-28 00:28:03 +0000 | |
|---|---|---|
| committer | 2014-06-27 16:59:53 +0000 | |
| commit | 2789dd9d3469a284f21a5363c3d145b09a37a73c (patch) | |
| tree | dc2f4d74b99718e2b9a055fd4a2c9d6facce8fc3 | |
| parent | bf1c813532db9c61537b08c14b4a2c22d9dadea0 (diff) | |
| parent | a929ded5e715620726f962910ce515280bea4ee1 (diff) | |
Merge "Create a dalvik symlink on the host."
| -rw-r--r-- | dalvikvm/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 5d838c0031..9f283417b6 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -56,7 +56,7 @@ LOCAL_MODULE_STEM_64 := dalvikvm64 include external/libcxx/libcxx.mk include $(BUILD_HOST_EXECUTABLE) -ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)32 -ifneq ($(HOST_PREFER_32_BIT),true) - ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)64 -endif
\ No newline at end of file +# Create symlink for the primary version target. +include $(BUILD_SYSTEM)/executable_prefer_symlink.mk + +ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) |