Update makefiles to support ndk build r13b

Author: gkalab

.gitignore

@@ -14,3 +14,5 @@
 /scidOnTheGo/build
 /chessEngineSupportLibrary/build
 /scidOnTheGo/src/main/jniLibs
+/scidOnTheGo/src/main/libs
+/scidOnTheGo/src/main/obj

scidOnTheGo/build.gradle

@@ -4,6 +4,11 @@ android {
     compileSdkVersion 29
     buildToolsVersion "28.0.3"
 
+    sourceSets.main {
+        jniLibs.srcDir 'src/main/libs'
+        jni.srcDirs = [] //disable automatic ndk-build call
+    }
+
     defaultConfig {
         applicationId "org.scid.android"
         minSdkVersion 14

scidOnTheGo/src/main/jni/Android.mk

@@ -2,13 +2,9 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+LOCAL_LDLIBS    := -llog -latomic
 LOCAL_MODULE    := jni
 LOCAL_SRC_FILES := jniscid.cpp
-LOCAL_LDLIBS    := -llog
-
-LOCAL_CFLAGS    := -mandroid \
-	-DTARGET_OS=android -D__ANDROID__ \
-	-isystem $(SYSROOT)/usr/include
 
 LOCAL_STATIC_LIBRARIES := scid
 

scidOnTheGo/src/main/jni/Application.mk

@@ -1,2 +1,3 @@
-APP_ABI := armeabi armeabi-v7a x86
-APP_STL := stlport_static
+APP_ABI := all
+APP_STL := stlport_static
+NDK_TOOLCHAIN_VERSION=clang

scidOnTheGo/src/main/jni/scid/Android.mk

@@ -10,11 +10,6 @@ LOCAL_SRC_FILES := \
     mfile.cpp dstring.cpp pgnparse.cpp stored.cpp \
     movelist.cpp
 
-LOCAL_CFLAGS    := -mandroid \
-	-DTARGET_OS=android -D__ANDROID__ \
-	-isystem $(SYSROOT)/usr/include \
-	-DNO_PREFETCH=1
-
 LOCAL_STATIC_LIBRARIES :=
 
 include $(BUILD_STATIC_LIBRARY)