Android: update example NDK project

pull/71/head
Chris Conlon 2017-08-09 14:43:39 -06:00
parent 2d8edba2bd
commit b528643aba
3 changed files with 26 additions and 6 deletions

View File

@ -3,7 +3,7 @@
package="com.wolfssl.example"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="10" />
<uses-sdk android:minSdkVersion="24" />
<application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="JNITest"
android:label="@string/app_name">

View File

@ -13,6 +13,8 @@ LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
-DWC_RSA_BLINDING -DTFM_NO_ASM \
-Wall
LOCAL_SRC_FILES := src/crl.c \
src/internal.c \
@ -30,6 +32,7 @@ LOCAL_SRC_FILES := src/crl.c \
wolfcrypt/src/camellia.c \
wolfcrypt/src/chacha.c \
wolfcrypt/src/chacha20_poly1305.c \
wolfcrypt/src/cmac.c \
wolfcrypt/src/coding.c \
wolfcrypt/src/compress.c \
wolfcrypt/src/curve25519.c \
@ -54,7 +57,7 @@ LOCAL_SRC_FILES := src/crl.c \
wolfcrypt/src/md4.c \
wolfcrypt/src/md5.c \
wolfcrypt/src/memory.c \
wolfcrypt/src/misc.c \
wolfcrypt/src/pkcs12.c \
wolfcrypt/src/pkcs7.c \
wolfcrypt/src/poly1305.c \
wolfcrypt/src/pwdbased.c \
@ -65,10 +68,13 @@ LOCAL_SRC_FILES := src/crl.c \
wolfcrypt/src/sha.c \
wolfcrypt/src/sha256.c \
wolfcrypt/src/sha512.c \
wolfcrypt/src/signature.c \
wolfcrypt/src/srp.c \
wolfcrypt/src/tfm.c \
wolfcrypt/src/wc_encrypt.c \
wolfcrypt/src/wc_port.c
wolfcrypt/src/wc_port.c \
wolfcrypt/src/wolfevent.c \
wolfcrypt/src/wolfmath.c
include $(BUILD_SHARED_LIBRARY)
@ -83,7 +89,14 @@ LOCAL_SRC_FILES := native/com_wolfssl_WolfSSL.c \
native/com_wolfssl_WolfSSLSession.c \
native/com_wolfssl_wolfcrypt_ECC.c \
native/com_wolfssl_wolfcrypt_RSA.c
LOCAL_CFLAGS := -Wall -Os -DWOLFSSL_DTLS -DHAVE_ECC
LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
-DWC_RSA_BLINDING -DTFM_NO_ASM \
-Wall
LOCAL_SHARED_LIBRARIES := libwolfssl
include $(BUILD_SHARED_LIBRARY)
@ -93,7 +106,14 @@ LOCAL_PATH := $(TOP_PATH)/jni
LOCAL_MODULE := libjnitest
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_SRC_FILES := jnitest.c
LOCAL_CFLAGS := -Wall
LOCAL_CFLAGS := -DOPENSSL_EXTRA -DWOLFSSL_DTLS -D_POSIX_THREADS -DNDEBUG \
-DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER \
-DHAVE_PK_CALLBACKS -DNO_DSA -DHAVE_ECC -DTFM_ECC256 \
-DECC_SHAMIR -DNO_MD4 -DNO_HC128 -DNO_RABBIT \
-DHAVE_OCSP -DHAVE_CRL -DWOLFSSL_JNI -DHAVE_DH \
-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT \
-DWC_RSA_BLINDING -DTFM_NO_ASM \
-Wall
LOCAL_SHARED_LIBRARIES := libwolfssl
include $(BUILD_SHARED_LIBRARY)

View File

@ -8,5 +8,5 @@
# project structure.
# Project target.
target=android-19
target=android-24