Commit 0c6eeae0 authored by Max Lv's avatar Max Lv

fix compile issues

parent 8262330e
...@@ -105,7 +105,7 @@ SHRPX_SOURCES := util.cc spdylay_ssl.cc \ ...@@ -105,7 +105,7 @@ SHRPX_SOURCES := util.cc spdylay_ssl.cc \
shrpx_accesslog.cc http-parser/http_parser.c \ shrpx_accesslog.cc http-parser/http_parser.c \
shrpx.cc shrpx.cc
LOCAL_STATIC_LIBRARIES := libevent libcrypto libssl libspdylay LOCAL_STATIC_LIBRARIES := libevent libssl libcrypto libspdylay
LOCAL_LDLIBS := -lz LOCAL_LDLIBS := -lz
......
...@@ -524,8 +524,8 @@ local_c_includes := \ ...@@ -524,8 +524,8 @@ local_c_includes := \
local_c_flags := -DNO_WINDOWS_BRAINDEATH local_c_flags := -DNO_WINDOWS_BRAINDEATH
####################################### #######################################
# static library
# target
include $(CLEAR_VARS) include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk include $(LOCAL_PATH)/../android-config.mk
LOCAL_SRC_FILES += $(local_src_files) LOCAL_SRC_FILES += $(local_src_files)
...@@ -545,33 +545,4 @@ ifeq ($(TARGET_SIMULATOR),true) ...@@ -545,33 +545,4 @@ ifeq ($(TARGET_SIMULATOR),true)
endif endif
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libcrypto 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) include $(BUILD_STATIC_LIBRARY)
...@@ -58,28 +58,7 @@ include $(CLEAR_VARS) ...@@ -58,28 +58,7 @@ include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk include $(LOCAL_PATH)/../android-config.mk
LOCAL_SRC_FILES += $(local_src_files) LOCAL_SRC_FILES += $(local_src_files)
LOCAL_C_INCLUDES += $(local_c_includes) LOCAL_C_INCLUDES += $(local_c_includes)
LOCAL_SHARED_LIBRARIES += libcrypto #LOCAL_STATIC_LIBRARIES += libcrypto
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libssl LOCAL_MODULE:= libssl
include $(BUILD_SHARED_LIBRARY) include $(BUILD_STATIC_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)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment