diff --git a/android-project/jni/Application.mk b/android-project/jni/Application.mk index e5b50793b..5ea0fb4ce 100644 --- a/android-project/jni/Application.mk +++ b/android-project/jni/Application.mk @@ -4,3 +4,7 @@ # APP_STL := stlport_static APP_ABI := armeabi armeabi-v7a x86 + +# Min SDK level +APP_PLATFORM=android-10 + diff --git a/include/SDL_config_android.h b/include/SDL_config_android.h index a388ba8de..996cf76c9 100644 --- a/include/SDL_config_android.h +++ b/include/SDL_config_android.h @@ -43,6 +43,7 @@ #define HAVE_STDINT_H 1 #define HAVE_CTYPE_H 1 #define HAVE_MATH_H 1 +#define HAVE_SIGNAL_H 1 /* C library functions */ #define HAVE_MALLOC 1 @@ -75,6 +76,7 @@ #define HAVE_STRTOULL 1 #define HAVE_STRTOD 1 #define HAVE_ATOI 1 +#define HAVE_ATOF 1 #define HAVE_STRCMP 1 #define HAVE_STRNCMP 1 #define HAVE_STRCASECMP 1 @@ -101,6 +103,7 @@ #define HAVE_SQRTF 1 #define HAVE_TAN 1 #define HAVE_TANF 1 +#define HAVE_SIGACTION 1 #define HAVE_SETJMP 1 #define HAVE_NANOSLEEP 1 #define HAVE_SYSCONF 1 diff --git a/src/thread/pthread/SDL_systhread.c b/src/thread/pthread/SDL_systhread.c index 05384ab73..4958f6fb9 100644 --- a/src/thread/pthread/SDL_systhread.c +++ b/src/thread/pthread/SDL_systhread.c @@ -122,10 +122,10 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args) void SDL_SYS_SetupThread(const char *name) { -#if !defined(__ANDROID__) && !defined(__NACL__) +#if !defined(__NACL__) int i; sigset_t mask; -#endif /* !__ANDROID__ && !__NACL__ */ +#endif /* !__NACL__ */ if (name != NULL) { #if defined(__MACOSX__) || defined(__IPHONEOS__) || defined(__LINUX__) @@ -155,14 +155,14 @@ SDL_SYS_SetupThread(const char *name) } /* NativeClient does not yet support signals.*/ -#if !defined(__ANDROID__) && !defined(__NACL__) +#if !defined(__NACL__) /* Mask asynchronous signals for this thread */ sigemptyset(&mask); for (i = 0; sig_list[i]; ++i) { sigaddset(&mask, sig_list[i]); } pthread_sigmask(SIG_BLOCK, &mask, 0); -#endif /* !__ANDROID__ && !__NACL__ */ +#endif /* !__NACL__ */ #ifdef PTHREAD_CANCEL_ASYNCHRONOUS