#298 wants reopening, x86 devices are crashing. Let's just build with…

… ndk r10c for now.

Reverts 07475df.

app/build.gradle

@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         applicationId "name.boyle.chris.sgtpuzzles"
-        versionCode 107
+        versionCode 108
         versionName "${timestamp()}-${idForSimon()}"
 
         if (file(ndkDir.absolutePath + '/platforms/android-15').exists()) {  // the last without PIE
@@ -124,7 +124,6 @@ android.applicationVariants.all{ variant ->
             abiParam,
             'NDK_LOG=1',
             'NDK_DEBUG=' + (variant.ndkCompile.debuggable ? '1' : '0')]
-        // You must remove the fake stpcpy implementation in android-gen.c when increasing APP_PLATFORM to >= 21
         exec {
             commandLine common + [
                     'APP_PLATFORM=android-9',  // 9 is earliest for x86 + mips

app/src/main/jni/android-gen.c

@@ -1,18 +1,9 @@
 #ifdef EXECUTABLE
 #include <stdio.h>
-#include <string.h>
 #include "puzzles.h"
 
 #define USAGE "Usage: puzzles-gen gamename [params | --seed seed | --desc desc]\n"
 
-/* https://github.com/chrisboyle/sgtpuzzles/issues/298 */
-char *
-stpcpy(char *dst, char const *src)
-{
-	size_t src_len = strlen(src);
-	return memcpy(dst, src, src_len) + src_len;
-}
-
 struct frontend {
 	midend *me;
 };