DroidFish: Updates for NDK version r15c.

The minimum required android version had to be changed to 4.0.1.

DroidFish/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-sdk android:minSdkVersion="11"
+    <uses-sdk android:minSdkVersion="14"
               android:targetSdkVersion="24"/>
     <application android:name="org.petero.droidfish.DroidFishApp"
                  android:icon="@mipmap/icon"

DroidFish/build_copy_exe.xml

@@ -6,6 +6,8 @@
         <copy file="${basedir}/libs/armeabi/stockfish-nopie" tofile="${basedir}/assets/stockfish-armeabi-nopie"/>
         <copy file="${basedir}/libs/armeabi-v7a/stockfish" tofile="${basedir}/assets/stockfish-armeabi-v7a"/>
         <copy file="${basedir}/libs/armeabi-v7a/stockfish-nopie" tofile="${basedir}/assets/stockfish-armeabi-v7a-nopie"/>
+        <copy file="${basedir}/libs/mips/stockfish"        tofile="${basedir}/assets/stockfish-mips"/>
+        <copy file="${basedir}/libs/mips/stockfish-nopie"  tofile="${basedir}/assets/stockfish-mips-nopie"/>
         <copy file="${basedir}/libs/mips64/stockfish"      tofile="${basedir}/assets/stockfish-mips64"/>
         <copy file="${basedir}/libs/x86/stockfish"         tofile="${basedir}/assets/stockfish-x86"/>
         <copy file="${basedir}/libs/x86/stockfish-nopie"   tofile="${basedir}/assets/stockfish-x86-nopie"/>

DroidFish/jni/Application.mk

@@ -1,5 +1,4 @@
-APP_PLATFORM := 11
+APP_PLATFORM := android-14
-APP_ABI := arm64-v8a armeabi-v7a armeabi mips64 x86 x86_64
+APP_ABI := all
-APP_STL := gnustl_static
+APP_STL := c++_static
 APP_OPTIM := release
-NDK_TOOLCHAIN_VERSION := 4.9

DroidFish/jni/gtb/Android.mk

@@ -18,7 +18,6 @@ LOCAL_CFLAGS    := \
 	-I $(LOCAL_PATH)/sysport/ -I $(LOCAL_PATH)/compression/ \
 	-I $(LOCAL_PATH)/compression/liblzf/ -I $(LOCAL_PATH)/compression/zlib/ \
 	-I $(LOCAL_PATH)/compression/lzma/ -I $(LOCAL_PATH)/compression/huffman/ \
-	-D Z_PREFIX -D NDEBUG -Wall\
+	-D Z_PREFIX -D NDEBUG -Wall
-	 -mandroid -DTARGET_OS=android -D__ANDROID__
 
 include $(BUILD_SHARED_LIBRARY)

DroidFish/jni/gtb/compression/liblzf/lzfP.h

@@ -79,7 +79,11 @@
  * Unconditionally aligning does not cost very much, so do it if unsure
  */
 #ifndef STRICT_ALIGN
-# define STRICT_ALIGN !(defined(__i386) || defined (__amd64))
+# if !(defined(__i386) || defined (__amd64))
+#  define STRICT_ALIGN 1
+# else
+#  define STRICT_ALIGN 0
+# endif
 #endif
 
 /*

DroidFish/jni/gtb/compression/lzma/Lzma86Dec.c

@@ -12,8 +12,8 @@ Public domain */
 #define LZMA86_SIZE_OFFSET (1 + LZMA_PROPS_SIZE)
 #define LZMA86_HEADER_SIZE (LZMA86_SIZE_OFFSET + 8)
 
-static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
+static void *SzAlloc(void *p, size_t size) { (void)p; return MyAlloc(size); }
-static void SzFree(void *p, void *address) { p = p; MyFree(address); }
+static void SzFree(void *p, void *address) { (void)p; MyFree(address); }
 static ISzAlloc g_Alloc = { SzAlloc, SzFree };
 
 SRes Lzma86_GetUnpackSize(const Byte *src, SizeT srcLen, UInt64 *unpackSize)

DroidFish/jni/gtb/compression/lzma/Lzma86Enc.c

@@ -13,8 +13,8 @@ Public domain */
 
 #define SZE_OUT_OVERFLOW SZE_DATA_ERROR
 
-static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
+static void *SzAlloc(void *p, size_t size) { (void)p; return MyAlloc(size); }
-static void SzFree(void *p, void *address) { p = p; MyFree(address); }
+static void SzFree(void *p, void *address) { (void)p; MyFree(address); }
 static ISzAlloc g_Alloc = { SzAlloc, SzFree };
 
 #define LZMA86_SIZE_OFFSET (1 + LZMA_PROPS_SIZE)

DroidFish/jni/gtb/compression/lzma/LzmaEnc.c

@@ -2140,7 +2140,7 @@ static void LzmaEnc_Finish(CLzmaEncHandle pp)
   if (p->mtMode)
     MatchFinderMt_ReleaseStream(&p->matchFinderMt);
   #else
-  pp = pp;
+  (void)pp;
   #endif
 }
 

DroidFish/jni/rtb/Android.mk

@@ -9,9 +9,8 @@ LOCAL_SRC_FILES := \
 	RtbProbe.cpp
 
 LOCAL_CFLAGS    := --std=c++11 \
-	-I $(LOCAL_PATH)/sysport/ -I -DNDEBUG -Wall \
+	-I $(LOCAL_PATH)/sysport/ -I -DNDEBUG -Wall
-	 -mandroid -DTARGET_OS=android -D__ANDROID__ \
+
-	-D__STDC_INT64__ -D_GLIBCXX_USE_C99_STDINT_TR1 \
+LOCAL_LDLIBS	+= -latomic
-	-D_GLIBCXX_HAS_GTHREADS -D_GLIBCXX__PTHREADS
 
 include $(BUILD_SHARED_LIBRARY)

DroidFish/jni/rtb/move.hpp

@@ -45,7 +45,7 @@ public:
     int promoteTo() const;
 
     /** Not declared "nothrow". Avoids nullptr check in generated assembly code when using placement new. */
-    void* operator new (std::size_t size, void* ptr) { return ptr; }
+    void* operator new (size_t size, void* ptr) { return ptr; }
 
 private:
     /** From square, 0-63. */

DroidFish/jni/stockfish/Android.mk

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := stockfish-nopie
 LOCAL_SRC_FILES := $(SF_SRC_FILES)
 LOCAL_CFLAGS    := -std=c++11 -O2 $(MY_ARCH_DEF)
+LOCAL_LDLIBS	+= -latomic
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -27,4 +28,5 @@ LOCAL_MODULE    := stockfish
 LOCAL_SRC_FILES := $(SF_SRC_FILES)
 LOCAL_CFLAGS    := -std=c++11 -O2 -fPIE $(MY_ARCH_DEF)
 LOCAL_LDFLAGS	+= -fPIE -pie
+LOCAL_LDLIBS	+= -latomic
 include $(BUILD_EXECUTABLE)

DroidFish/jni/stockfish/misc.h

@@ -26,7 +26,6 @@
 #include <ostream>
 #include <string>
 #include <vector>
-#include <sstream>
 
 #include "types.h"
 
@@ -110,17 +109,4 @@ namespace WinProcGroup {
   void bindThisThread(size_t idx);
 }
 
-inline int stoi(const std::string& s) {
-    std::stringstream ss(s);
-    int result = 0;
-    ss >> result;
-    return result;
-}
-
-inline std::string to_string(int v) {
-    std::stringstream ss;
-    ss << v;
-    return ss.str();
-}
-
 #endif // #ifndef MISC_H_INCLUDED

DroidFish/jni/stockfish/ucioption.cpp

@@ -112,7 +112,7 @@ Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f)
 {}
 
 Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
-{ defaultValue = currentValue = to_string(v); }
+{ defaultValue = currentValue = std::to_string(v); }
 
 Option::operator int() const {
   assert(type == "check" || type == "spin");