Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now it will build as a subproject. (It will also #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Now it will build as a subproject. (It will also #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a507f0
Now it will build as a subproject. (It will also
FellowTraveler Dec 6, 2013
8d77df7
Removed TOOLCHAIN (it was preventing build.)
FellowTraveler Dec 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
obj/
libs/
4 changes: 2 additions & 2 deletions apps/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ LOCAL_SHARED_LIBRARIES := \
libcrypto

LOCAL_C_INCLUDES := \
$(NDK_PROJECT_PATH) \
$(NDK_PROJECT_PATH)/include
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../include

LOCAL_CFLAGS := -DMONOLITH

Expand Down
11 changes: 5 additions & 6 deletions crypto/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,11 +471,11 @@ local_src_files := \
x509v3/v3err.c

local_c_includes := \
$(NDK_PROJECT_PATH) \
$(NDK_PROJECT_PATH)/crypto/asn1 \
$(NDK_PROJECT_PATH)/crypto/evp \
$(NDK_PROJECT_PATH)/include \
$(NDK_PROJECT_PATH)/include/openssl
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/asn1 \
$(LOCAL_PATH)/evp \
$(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../include/openssl

local_c_flags := -DNO_WINDOWS_BRAINDEATH

Expand Down Expand Up @@ -527,7 +527,6 @@ 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)
1 change: 0 additions & 1 deletion jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
NDK_TOOLCHAIN_VERSION=4.4.3
APP_PROJECT_PATH := $(shell pwd)
APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
16 changes: 13 additions & 3 deletions ssl/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
LOCAL_PATH:= $(call my-dir)

local_c_includes := \
$(NDK_PROJECT_PATH) \
$(NDK_PROJECT_PATH)/include \
$(NDK_PROJECT_PATH)/crypto
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../crypto

local_src_files:= \
s2_meth.c \
Expand Down Expand Up @@ -64,6 +64,16 @@ ifeq ($(WITH_HOST_DALVIK),true)
include $(BUILD_SHARED_LIBRARY)
endif

#static
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_MODULE_TAGS := optional
LOCAL_MODULE:= libssl_static
include $(BUILD_STATIC_LIBRARY)

# ssltest
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk
Expand Down