Android buildfixes.

Author: zoltanvb

jni/Android.mk

@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 CORE_DIR := $(LOCAL_PATH)/../src
-
+platform := unix
 include $(CORE_DIR)/libretro/Makefile.common
 
 COREFLAGS := -D__LIBRETRO__ -DB2_LIBRETRO_CORE -DHAVE_STRLCPY -DBUILD_TYPE_Final -DBBCMICRO_TRACE $(INCFLAGS)

src/libretro/Makefile.common

@@ -46,14 +46,14 @@ SOURCES_CPP := \
 	$(CORE_DIR)/shared/c/mutex.cpp \
 	$(CORE_DIR)/shared/c/sha1.cpp \
 	$(CORE_DIR)/shared/c/file_io.cpp \
+	$(CORE_DIR)/shared/c/path.cpp \
 	$(CORE_DIR)/beeb/src/DiscGeometry.cpp \
 	$(CORE_DIR)/beeb/src/DirectDiscImage.cpp \
 	$(CORE_DIR)/b2/filters.cpp \
 	$(CORE_DIR)/b2/Remapper.cpp \
 
 SOURCES_C := \
 	$(CORE_DIR)/6502/c/6502.c \
-	$(CORE_DIR)/shared/c/path.c \
 
 ifneq (,$(filter osx ios-arm64 tvos-arm64,$(platform)))
 SOURCES_CPP += \

src/shared/c/system_linux.cpp

@@ -6,8 +6,10 @@
 #include <strings.h>
 #include <inttypes.h>
 #include <stdlib.h>
+#if !defined(ANDROID)
 #include <execinfo.h>
 #include <uuid/uuid.h>
+#endif
 #include <shared/debug.h>
 #include <fcntl.h>
 #include <sys/wait.h>
@@ -212,7 +214,11 @@ char **GetBacktraceSymbols(void *const *addresses, int num_addresses) {
 
     if (num_addresses <= 0) {
         /* somebody else's problem... */
+#if !defined(ANDROID)
         return backtrace_symbols(addresses, num_addresses);
+#else
+    return (char **)NULL;
+#endif
     }
 
     char *result = NULL;
@@ -340,7 +346,11 @@ char **GetBacktraceSymbols(void *const *addresses, int num_addresses) {
 
 #else
 
+#if !defined(ANDROID)
     return backtrace_symbols(addresses, num_addresses);
+#else
+    return (char **)NULL;
+#endif
 
 #endif
 }