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 0b9f6bb..21b7805 100644 (file)
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -53,27 +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 libffi, libssl, and libz, so there is no need
-        # to build any of them.
-        LOCAL_LDLIBS := -lffi -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
-        # In this case, include libssl and libz, but libffi isn't listed:
-        # The recommendation is that host builds should always either
-        # have sufficient custom code so that libffi isn't needed at all,
-        # or they should use the platform's provided libffi (as is done
-        # for darwin-x86 above).
-        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)