From f788d3074cc52e244a5462494bc3626c0a9690d5 Mon Sep 17 00:00:00 2001
From: Aaron Kling
Date: Sat, 26 Dec 2020 12:08:05 -0600
Subject: libretro: android: Fix non-armv7 builds

---
 jni/Android.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 3f7db16..1c3e18f 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -180,13 +180,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   SOURCES_C   += $(DYNAREC_DIR)/backends/psx/emu_if.c
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
   COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
-  COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__"
   SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
                  $(FRONTEND_DIR)/cspace_arm.S
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
 else
   COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
-  COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__"
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
 endif
 
-- 
cgit v1.2.3


From 14f55d927385290d76b19e7e931bd7a566b163d8 Mon Sep 17 00:00:00 2001
From: Aaron Kling
Date: Sat, 26 Dec 2020 12:15:56 -0600
Subject: libretro: android: remove flag allowing text relocations

This is not allowed on api 23+
---
 jni/Android.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 1c3e18f..eabe464 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -208,8 +208,5 @@ LOCAL_ARM_MODE      := arm
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   LOCAL_ARM_NEON  := true
 endif
-ifeq ($(TARGET_ARCH),arm)
-  LOCAL_LDLIBS    += -Wl,-no-warn-shared-textrel
-endif
 
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3