diff --git a/jni/Android.mk b/jni/Android.mk
index a065fa18..ef1989e8 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -105,7 +105,7 @@ SHRPX_SOURCES := util.cc spdylay_ssl.cc \
 	shrpx_accesslog.cc http-parser/http_parser.c \
 	shrpx.cc 
 
-LOCAL_STATIC_LIBRARIES := libevent libcrypto libssl libspdylay
+LOCAL_STATIC_LIBRARIES := libevent libssl libcrypto libspdylay
 
 LOCAL_LDLIBS := -lz
 
diff --git a/jni/openssl/crypto/Android.mk b/jni/openssl/crypto/Android.mk
index 8873b3ad..12bc1b69 100644
--- a/jni/openssl/crypto/Android.mk
+++ b/jni/openssl/crypto/Android.mk
@@ -524,8 +524,8 @@ local_c_includes := \
 local_c_flags := -DNO_WINDOWS_BRAINDEATH
 
 #######################################
+# static library
 
-# target
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/../android-config.mk
 LOCAL_SRC_FILES += $(local_src_files)
@@ -545,33 +545,4 @@ ifeq ($(TARGET_SIMULATOR),true)
 endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libcrypto
-include $(BUILD_SHARED_LIBRARY)
-
-#######################################
-# host shared library
-ifeq ($(WITH_HOST_DALVIK),true)
-    include $(CLEAR_VARS)
-    include $(LOCAL_PATH)/../android-config.mk
-    LOCAL_SRC_FILES += $(local_src_files)
-    LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
-    LOCAL_C_INCLUDES += $(local_c_includes)
-    LOCAL_SRC_FILES += $(non_arm_src_files)
-    LOCAL_LDLIBS += -ldl
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE:= libcrypto
-    include $(BUILD_SHARED_LIBRARY)
-endif
-
-########################################
-# host static library, which is used by some SDK tools.
-
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/../android-config.mk
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SRC_FILES += $(non_arm_src_files)
-LOCAL_LDLIBS += -ldl
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto_static
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/openssl/ssl/Android.mk b/jni/openssl/ssl/Android.mk
index 592c3780..dc0e2e12 100644
--- a/jni/openssl/ssl/Android.mk
+++ b/jni/openssl/ssl/Android.mk
@@ -58,28 +58,7 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/../android-config.mk
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto
+#LOCAL_STATIC_LIBRARIES += libcrypto
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libssl
-include $(BUILD_SHARED_LIBRARY)
-
-ifeq ($(WITH_HOST_DALVIK),true)
-    include $(CLEAR_VARS)
-    include $(LOCAL_PATH)/../android-config.mk
-    LOCAL_SRC_FILES += $(local_src_files)
-    LOCAL_C_INCLUDES += $(local_c_includes)
-    LOCAL_SHARED_LIBRARIES += libcrypto
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE:= libssl
-    include $(BUILD_SHARED_LIBRARY)
-endif
-
-# ssltest
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/../android-config.mk
-LOCAL_SRC_FILES:= ssltest.c
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libssl libcrypto
-LOCAL_MODULE:= ssltest
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_EXECUTABLE)
+include $(BUILD_STATIC_LIBRARY)