timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compiling with last NDK + some hardening

Browse source 
Patch received in https://github.com/matrix-org/olm/issues/13
This commit is contained in:
Benoit Marty 2018-06-26 10:37:07 +02:00 committed by Hubert Chathi
parent 08e50693b7
commit ed7649d71e
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/olm-sdk/src/main/jni/Android.mk
View file

@ -21,6 +21,9 @@ LOCAL_CFLAGS+= -DOLMLIB_VERSION_MAJOR=$(MAJOR) \
#LOCAL_CFLAGS+= -DNDK_DEBUG #LOCAL_CFLAGS+= -DNDK_DEBUG
LOCAL_CFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wall
LOCAL_LDFLAGS=-z relro -z now
LOCAL_C_INCLUDES+= $(LOCAL_PATH)/$(SRC_ROOT_DIR)/include/ \ LOCAL_C_INCLUDES+= $(LOCAL_PATH)/$(SRC_ROOT_DIR)/include/ \
$(LOCAL_PATH)/$(SRC_ROOT_DIR)/lib $(LOCAL_PATH)/$(SRC_ROOT_DIR)/lib

4
android/olm-sdk/src/main/jni/Application.mk
View file

@ -1,3 +1,3 @@
APP_PLATFORM := android-16 APP_PLATFORM := android-16
APP_ABI := arm64-v8a armeabi-v7a armeabi x86_64 x86 APP_ABI := arm64-v8a armeabi-v7a x86_64 x86
APP_STL := gnustl_static APP_STL := gnustl_static

1
android/olm-sdk/src/main/jni/olm_jni.h
View file

@ -21,6 +21,7 @@
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include <string.h>
#include <sstream> #include <sstream>
#include <jni.h> #include <jni.h>
#include <android/log.h> #include <android/log.h>