From ef28920179336f6b7dcbd8a7429230aafe1c4ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 14 Aug 2023 13:47:55 +0200
Subject: [PATCH] Android: Remove support for 32-bit x86 builds

---
 android/build.gradle       |  4 ++--
 android/jni/Android.mk     | 18 +-----------------
 android/jni/Application.mk |  2 +-
 android/jni/Locals.mk      | 10 ----------
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c6e72ea3b1..c2e08dc091 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -133,7 +133,7 @@ android {
 				}
 			}
 			ndk {
-				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
 			}
 		}
 		gold {
@@ -152,7 +152,7 @@ android {
 				}
 			}
 			ndk {
-				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
 			}
 		}
 		vr {
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index ef5383e3ba..b98569a2d5 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -290,23 +290,7 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Locals.mk
 LOCAL_WHOLE_STATIC_LIBRARIES += ppsspp_common
 
-ifeq ($(TARGET_ARCH_ABI),x86)
-ARCH_FILES := \
-  $(SRC)/Core/MIPS/x86/CompALU.cpp \
-  $(SRC)/Core/MIPS/x86/CompBranch.cpp \
-  $(SRC)/Core/MIPS/x86/CompFPU.cpp \
-  $(SRC)/Core/MIPS/x86/CompLoadStore.cpp \
-  $(SRC)/Core/MIPS/x86/CompVFPU.cpp \
-  $(SRC)/Core/MIPS/x86/CompReplace.cpp \
-  $(SRC)/Core/MIPS/x86/Asm.cpp \
-  $(SRC)/Core/MIPS/x86/Jit.cpp \
-  $(SRC)/Core/MIPS/x86/JitSafeMem.cpp \
-  $(SRC)/Core/MIPS/x86/RegCache.cpp \
-  $(SRC)/Core/MIPS/x86/RegCacheFPU.cpp \
-  $(SRC)/GPU/Common/VertexDecoderX86.cpp \
-  $(SRC)/GPU/Software/DrawPixelX86.cpp \
-  $(SRC)/GPU/Software/SamplerX86.cpp
-else ifeq ($(TARGET_ARCH_ABI),x86_64)
+ifeq ($(TARGET_ARCH_ABI),x86_64)
 ARCH_FILES := \
   $(SRC)/Core/MIPS/x86/CompALU.cpp \
   $(SRC)/Core/MIPS/x86/CompBranch.cpp \
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index ab283e0a4f..9282f31bd4 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_STL := c++_static
 APP_PLATFORM := android-9
-APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
+APP_ABI := arm64-v8a armeabi-v7a x86_64
 APP_GNUSTL_CPP_FEATURES := exceptions
 NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index beed008585..aa71119f3b 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -53,16 +53,6 @@ ifeq ($(TARGET_ARCH_ABI),armeabi)
 
   LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -march=armv6
 endif
-ifeq ($(TARGET_ARCH_ABI),x86)
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavformat.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavcodec.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libswresample.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libswscale.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavutil.a
-  LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/x86/include
-
-  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign
-endif
 
 ifeq ($(TARGET_ARCH_ABI),x86_64)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavformat.a