From 9f7839c96a1961313cd490f0d0ff8b0816a527ab Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 3 Aug 2020 12:24:43 +0200 Subject: [PATCH 1/2] Fix Android Libretro build issues. --- libretro/Makefile.common | 8 ++------ libretro/jni/Android.mk | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 624d3f837c..7d44b4402f 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -486,7 +486,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(COREDIR)/Util/PPGeDraw.cpp \ $(COREDIR)/Util/AudioFormat.cpp \ $(COREDIR)/Util/PortManager.cpp \ - $(EXTDIR)/disarm.cpp \ $(CORE_DIR)/UI/TextureUtil.cpp \ $(CORE_DIR)/UI/GameInfoCache.cpp @@ -509,6 +508,7 @@ ifeq ($(WITH_DYNAREC),1) $(COREDIR)/MIPS/ARM/ArmJit.cpp \ $(COREDIR)/MIPS/ARM/ArmRegCache.cpp \ $(COREDIR)/MIPS/ARM/ArmRegCacheFPU.cpp \ + $(EXTDIR)/disarm.cpp \ $(GPUCOMMONDIR)/VertexDecoderArm.cpp ifeq ($(HAVE_NEON),1) @@ -545,6 +545,7 @@ ifeq ($(WITH_DYNAREC),1) SOURCES_CXX += \ $(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \ $(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \ + $(COREDIR)/Util/AudioFormatNEON.cpp \ $(COMMONDIR)/ColorConvNEON.cpp \ $(GPUDIR)/Common/TextureDecoderNEON.cpp @@ -591,11 +592,6 @@ endif SOURCES_C += $(NATIVEDIR)/math/fast/fast_matrix_sse.c endif endif -SOURCES_CXX += \ - $(COMMONDIR)/ArmEmitter.cpp \ - $(COMMONDIR)/Arm64Emitter.cpp \ - $(COREDIR)/Util/DisArm64.cpp - #UDIS86 # Compiled and linked even on ARM for now diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index e1b48c2f7a..f5703ba4c4 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -9,6 +9,7 @@ COREFLAGS := CORE_DIR := ../.. FFMPEGDIR := $(CORE_DIR)/ffmpeg FFMPEGLIBS += libavformat libavcodec libavutil libswresample libswscale +WITH_DYNAREC := 1 ifeq ($(TARGET_ARCH),arm64) COREFLAGS += -DARM64 -D_ARCH_64 From cbdb9cc5dc00d398eaae416e1105bdff30ced3cb Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 3 Aug 2020 19:04:40 +0200 Subject: [PATCH 2/2] Expose SYSPROP_SYSTEMVERSION to Libretro Android core. This fixes crashes with targetSdk 29. --- libretro/libretro.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 2525541daa..2a962377a3 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "base/timeutil.h" #include "Common/ChunkFile.h" @@ -32,6 +33,10 @@ #include "libretro/libretro.h" #include "libretro/LibretroGraphicsContext.h" +#if PPSSPP_PLATFORM(ANDROID) +#include +#endif + #define DIR_SEP "/" #ifdef _WIN32 #define DIR_SEP_CHRS "/\\" @@ -857,6 +862,15 @@ int System_GetPropertyInt(SystemProperty prop) { case SYSPROP_AUDIO_SAMPLE_RATE: return SAMPLERATE; +#if PPSSPP_PLATFORM(ANDROID) + case SYSPROP_SYSTEMVERSION: { + char sdk[PROP_VALUE_MAX] = {0}; + if (__system_property_get("ro.build.version.sdk", sdk) != 0) { + return atoi(sdk); + } + return -1; + } +#endif default: break; }