Android build fixes, incomplete.

Author: zoltanvb

.gitignore

@@ -1,5 +1,6 @@
 /.dir-locals.el
 /build/
+/obj/
 /etc/b2_tests/[Zz]/
 /dependencies/ProcessorTests/
 *.etl

jni/Android.mk

@@ -0,0 +1,21 @@
+LOCAL_PATH := $(call my-dir)
+
+CORE_DIR := $(LOCAL_PATH)/../src
+
+include $(CORE_DIR)/libretro/Makefile.common
+
+COREFLAGS := -D__LIBRETRO__ -DB2_LIBRETRO_CORE -DHAVE_STRLCPY -DBUILD_TYPE_Final -DBBCMICRO_TRACE $(INCFLAGS)
+
+GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := retro
+LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_CPP)
+LOCAL_CXXFLAGS  := $(COREFLAGS) -fexceptions -frtti -std=c++17
+LOCAL_CFLAGS    := $(COREFLAGS)
+LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/link.T
+LOCAL_LDLIBS    := -llog
+include $(BUILD_SHARED_LIBRARY)

jni/Application.mk

@@ -0,0 +1,2 @@
+APP_STL := c++_static
+APP_ABI := all

src/libretro/Makefile.common

@@ -39,6 +39,7 @@ SOURCES_CPP := \
 	$(CORE_DIR)/beeb/src/TVOutput.cpp \
 	$(CORE_DIR)/beeb/src/type.cpp \
 	$(CORE_DIR)/beeb/src/video.cpp \
+	$(CORE_DIR)/beeb/src/uef.cpp \
 	$(CORE_DIR)/beeb/src/VideoULA.cpp \
 	$(CORE_DIR)/shared/c/log.cpp \
 	$(CORE_DIR)/shared/c/system.cpp \
@@ -52,10 +53,8 @@ SOURCES_CPP := \
 
 SOURCES_C := \
 	$(CORE_DIR)/6502/c/6502.c \
-	$(CORE_DIR)/shared/c/path.c \
-
 
-ifneq (,$(filter osx ios-arm64 tvos-arm64,$(platform)))
+ifneq (,$(findstring osx,$(platform)))
 SOURCES_CPP += \
 	$(CORE_DIR)/shared/c/system_osx.cpp \
 

src/link.T

@@ -0,0 +1,5 @@
+{
+   global: retro_*;
+   local: *;
+};
+

src/shared/c/log.cpp

@@ -671,7 +671,7 @@ void LogStackTrace(Log *log) {
     if (!log) {
         return;
     }
-
+#if !defined(ANDROID)
     void *buffer[100];
     int n = backtrace(buffer, sizeof buffer / sizeof buffer[0]);
 
@@ -699,6 +699,9 @@ void LogStackTrace(Log *log) {
 
     free(symbols);
     symbols = NULL;
+#else
+    log->f("Stack trace not supported on Android");
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////

src/shared/h/shared/system_posix.h

@@ -15,8 +15,9 @@ extern "C" {
  * system_windows.h, and it's certainly convenient. */
 #include <signal.h>
 #include <unistd.h>
+#if !defined(ANDROID)
 #include <execinfo.h>
-
+#endif
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////