Android build (#11)

* Android build fixes, incomplete.

* restore unwanted changes

* Android buildfixes.

* enable CI

Author: zoltanvb

Diff for: .gitignore

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

Diff for: .gitlab-ci.yml

@@ -40,8 +40,8 @@ include:
 
   ################################## CELLULAR ################################
   # Android
-  #- project: 'libretro-infrastructure/ci-templates'
-  #  file: '/android-jni.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-jni.yml'
 
   # iOS
   - project: 'libretro-infrastructure/ci-templates'
@@ -148,10 +148,10 @@ libretro-build-osx-arm64:
 #    - .core-defs
 
 # Android ARMv8a
-#android-arm64-v8a:
-#  extends:
-#    - .libretro-android-jni-arm64-v8a
-#    - .core-defs
+android-arm64-v8a:
+  extends:
+    - .libretro-android-jni-arm64-v8a
+    - .core-defs
 
 # Android 64-bit x86
 #android-x86_64:

Diff for: jni/Android.mk

@@ -0,0 +1,21 @@
+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)
+
+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)

Diff for: jni/Application.mk

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

Diff for: src/libretro/Makefile.common

@@ -39,22 +39,22 @@ 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 \
 	$(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 += \
 	$(CORE_DIR)/shared/c/system_osx.cpp \

Diff for: src/link.T

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

Diff for: 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
 }
 
 //////////////////////////////////////////////////////////////////////////

Diff for: 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
 }

Diff for: 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
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////