Merge "Intrinsics for float/int and double/long conversions." into dalvik-dev

[android-x86/dalvik.git] / dalvikvm / Android.mk

diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index f463c85..21b7805 100644 (file)
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -53,21 +53,21 @@ include $(BUILD_EXECUTABLE)
 ifeq ($(WITH_HOST_DALVIK),true)
 
     include $(CLEAR_VARS)
-
     LOCAL_SRC_FILES := $(dalvikvm_src_files)
     LOCAL_C_INCLUDES := $(dalvikvm_c_includes)
 
-    LOCAL_STATIC_LIBRARIES := \
-        libdvm-host
-
     ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86)
-        # OSX comes with libz and libssl, so there is no need to build them.
-        LOCAL_LDLIBS := -lssl -lz
+        # OS X comes with all these libraries, so there is no need
+        # to build any of them. Note: OpenSSL consists of libssl
+        # and libcrypto.
+        LOCAL_LDLIBS := -lffi -lssl -lcrypto -lz -lsqlite3
     else
-        LOCAL_STATIC_LIBRARIES += libssl libz
+        LOCAL_LDLIBS += -ldl -lpthread
+        LOCAL_SHARED_LIBRARIES += libdvm libcrypto libicuuc libicui18n libssl
+#        LOCAL_STATIC_LIBRARIES += libcutils liblog libdex libexpat libnativehelper libutils libz
     endif
 
-    LOCAL_MODULE := dalvikvm-host
+    LOCAL_MODULE := dalvikvm
 
     include $(BUILD_HOST_EXECUTABLE)