From 8f70ffe21071be56ebf388fa9efdaf7a8964ca51 Mon Sep 17 00:00:00 2001
From: Dusan Stevanovic <dule@wire.com>
Date: Thu, 21 Nov 2024 12:56:47 +0100
Subject: [PATCH] android: remove i686 support fixes WPB-11504

---
 mk/dist.mk      | 19 +++----------------
 mk/target.mk    |  3 ---
 mk/toolchain.mk |  3 ---
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index cf53d9c90..2bb4b9622 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -10,11 +10,10 @@
 # The target "dist_android" builds the following:
 #
 #    o  an Android AAR build/dist/android/avs.aar with the release code for
-#       armv7 and i386 architectures. 64 bit architectures will follow as
-#       soon as certain build troubles are sorted out.
+#       armv7, arm64 and x86_64 architectures. 
 #
 #    o  a Zip archive build/dist/android/avs.zip with the NDK shared
-#       libraries for Android armv7 and i386 as well as for OSX x86_64, and
+#       libraries for Android armv7, arm64 as well as for OSX x86_64, and
 #       the class files in non-jar form.
 #
 # The targets "dist_ios" and "dist_osx" build the following:
@@ -52,7 +51,7 @@ ifeq ($(DIST_ARCH),)
 	DIST_ARCH := $(ALL_AVS_ARCH) osx
 endif
 
-DIST_ARCH_android := $(filter armv7 arm64 i386 x86_64 osx,$(DIST_ARCH))
+DIST_ARCH_android := $(filter armv7 arm64 x86_64 osx,$(DIST_ARCH))
 DIST_ARCH_ios := $(filter arm64,$(DIST_ARCH))
 DIST_ARCH_iossim := $(filter arm64 x86_64,$(DIST_ARCH))
 DIST_ARCH_osx := $(filter arm64 x86_64,$(DIST_ARCH))
@@ -170,10 +169,6 @@ ifneq ($(filter arm64,$(DIST_ARCH)),)
 	$(call build_arch,arm64,arm64-v8a,aarch64-linux-android)
 endif
 
-ifneq ($(filter i386,$(DIST_ARCH)),)
-	$(call build_arch,i386,x86,i686-linux-android)
-endif
-
 ifneq ($(filter x86_64,$(DIST_ARCH)),)
 	$(call build_arch,x86_64,x86_64,x86_64-linux-android)
 endif
@@ -216,14 +211,6 @@ ifneq ($(filter arm64,$(DIST_ARCH)),)
 	@cp $(BUILD_BASE)/android-arm64/lib/libavs.so \
 		$(BUILD_DIST_AND)/zip/libs/arm64-v8a
 endif
-ifneq ($(filter i386,$(DIST_ARCH)),)
-	$(MAKE) contrib AVS_OS=android AVS_ARCH=i386 && \
-	$(MAKE) $(JOBS) avs AVS_OS=android AVS_ARCH=i386 && \
-	$(MAKE) android_shared AVS_OS=android AVS_ARCH=i386
-	@mkdir -p $(BUILD_DIST_AND)/zip/libs/x86
-	@cp $(BUILD_BASE)/android-i386/lib/libavs.so \
-		$(BUILD_DIST_AND)/zip/libs/x86
-endif
 ifneq ($(filter x86_64,$(DIST_ARCH)),)
 	$(MAKE) contrib AVS_OS=android AVS_ARCH=x86_64 && \
 	$(MAKE) $(JOBS) avs AVS_OS=android AVS_ARCH=x86_64 && \
diff --git a/mk/target.mk b/mk/target.mk
index 4057b786e..d6c37808f 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -14,7 +14,6 @@
 #
 #     AVS_OS=android		AVS_ARCH=armv7
 #				AVS_ARCH=arm64
-#     				AVS_ARCH=i386
 #     				AVS_ARCH=x86_64
 #     AVS_OS=linux		AVS_ARCH=x86_64
 #     				AVS_ARCH=i386
@@ -373,7 +372,6 @@ AVS_OS_FAMILY := linux
 
 CROSS_PREFIX_armv7  := armv7a-linux-androideabi27
 CROSS_PREFIX_arm64  := aarch64-linux-android27
-CROSS_PREFIX_i386   := i686-linux-android27
 CROSS_PREFIX_x86_64 := x86_64-linux-android27
 CROSS_PREFIX        := $(CROSS_PREFIX_$(AVS_ARCH))
 
@@ -457,7 +455,6 @@ ifeq ($(AVS_ARCH),armv7)
 CPPFLAGS += \
 	-march=armv7-a -mfpu=neon -mfloat-abi=softfp -mcpu=cortex-a8
 else ifeq ($(AVS_ARCH),arm64)
-else ifeq ($(AVS_ARCH),i386)
 else ifeq ($(AVS_ARCH),x86_64)
 else
 $(error Unknown architecture $(AVS_ARCH) for Android.)
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index ec39d0346..a5a6590cc 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -7,19 +7,16 @@ TOOLCHAIN_STL          := libc++
 
 TOOLCHAIN_ARCH_armv7   := arm
 TOOLCHAIN_ARCH_arm64   := arm64
-TOOLCHAIN_ARCH_i386    := x86
 TOOLCHAIN_ARCH_x86_64  := x86_64
 TOOLCHAIN_ARCH         := $(TOOLCHAIN_ARCH_$(AVS_ARCH))
 
 TOOLCHAIN_TOOLCHAIN_armv7  := arm-linux-androideabi-$(TOOLCHAIN_GCC_VERSION)
 TOOLCHAIN_TOOLCHAIN_arm64  := aarch64-linux-android-$(TOOLCHAIN_GCC_VERSION)
-TOOLCHAIN_TOOLCHAIN_i386   := x86-$(TOOLCHAIN_GCC_VERSION)
 TOOLCHAIN_TOOLCHAIN_x86_64 := x86_64-$(TOOLCHAIN_GCC_VERSION)
 TOOLCHAIN_TOOLCHAIN        := $(TOOLCHAIN_TOOLCHAIN_$(AVS_ARCH))
 
 TC_ABI_armv7  := armeabi-v7a
 TC_ABI_arm64  := arm64-v8a
-TC_ABI_i386   := x86
 TC_ABI_x86_64 := x86_64
 TC_ABI        := $(TC_ABI_$(AVS_ARCH))