From 1e550323773bf526a3b707352beddaa0e58b7b33 Mon Sep 17 00:00:00 2001 From: Lukas Lihotzki Date: Fri, 30 Apr 2021 14:51:47 +0200 Subject: [PATCH] Simplify olm-sdk/build.gradle by using defaults This doesn't change the output. Signed-off-by: Lukas Lihotzki --- android/olm-sdk/build.gradle | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle index 19803ef..9c0386f 100644 --- a/android/olm-sdk/build.gradle +++ b/android/olm-sdk/build.gradle @@ -15,18 +15,12 @@ android { externalNativeBuild { cmake { - arguments '-DANDROID_STL=c++_static', - '-DCMAKE_C_FLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wall', - '-DCMAKE_CXX_FLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wall', - '-DCMAKE_SHARED_LINKER_FLAGS=-z relro -z now', + arguments '-DCMAKE_C_FLAGS=-fstack-protector-all -Wall', + '-DCMAKE_CXX_FLAGS=-fstack-protector-all -Wall', '-DOLM_ANDROID_JNI=on', '-DOLM_TESTS=off' } } - - ndk { - abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64', 'x86' - } } buildTypes { debug {