From 9adfaf9b550e627002c83ec3d0837fd4a6617697 Mon Sep 17 00:00:00 2001 From: James Ingham Date: Thu, 11 Apr 2019 00:34:10 +0100 Subject: [PATCH 1/2] Switching to c++_static as stlport_static was removed from NDK r18b. --- lib/src/main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/main/jni/Application.mk b/lib/src/main/jni/Application.mk index 40f553b7a..513d91c1f 100644 --- a/lib/src/main/jni/Application.mk +++ b/lib/src/main/jni/Application.mk @@ -1,8 +1,8 @@ -APP_STL := stlport_static +APP_STL := c++_static APP_OPTIM := release APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64 APP_PLATFORM := android-15 NDK_TOOLCHAIN_VERSION := clang NDK_APP_LIBS_OUT=../jniLibs # Temp workaround for https://github.com/android-ndk/ndk/issues/332 -APP_DEPRECATED_HEADERS := true \ No newline at end of file +APP_DEPRECATED_HEADERS := true From a5a0da1ec336924ce5b84d99f2b756cf5de79d16 Mon Sep 17 00:00:00 2001 From: James Ingham Date: Fri, 15 Nov 2019 11:26:26 +0000 Subject: [PATCH 2/2] Added macOsX as a supported OS in the gradle build tasks. --- lib/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index 5c6800c50..9506b790e 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -104,7 +104,7 @@ task buildSqlite(dependsOn: installSqlite, type: Exec) { println("NDK directory: $ndkDir") // Add NDK_DEBUG=1 for debug symbols or V=1 for verbose building output - if (OperatingSystem.current().linux) { + if (OperatingSystem.current().linux || OperatingSystem.current().macOsX) { commandLine "$ndkDir/ndk-build", '-j8', '-C', file('src/main/jni').absolutePath } else if (OperatingSystem.current().windows) { commandLine "$ndkDir/ndk-build.cmd", '-j8', '-C', file('src/main/jni').absolutePath @@ -114,7 +114,7 @@ task buildSqlite(dependsOn: installSqlite, type: Exec) { } task ndkClean(type: Exec, description: 'Clean NDK Binaries') { - if (OperatingSystem.current().linux) { + if (OperatingSystem.current().linux || OperatingSystem.current().macOsX) { commandLine "$ndkDir/ndk-build", 'clean', '-C', file('src/main/jni').absolutePath } else if (OperatingSystem.current().windows) { commandLine "$ndkDir/ndk-build.cmd", 'clean', '-C', file('src/main/jni').absolutePath