From 458ed44d193d9184db874ab735f0f0f8deb63c3f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Sun, 5 Dec 2021 00:27:55 +0200
Subject: [PATCH] merge bitcoin#23744: Drop support for i686-linux-android host

---
 configure.ac           | 3 ---
 depends/README.md      | 1 -
 depends/packages/qt.mk | 1 -
 3 files changed, 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5d4d3127f4..9260107e43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,9 +789,6 @@ case $host in
         *armv7a*)
           ANDROID_ARCH=armeabi-v7a
           ;;
-        *i686*)
-          ANDROID_ARCH=i686
-          ;;
         *) AC_MSG_ERROR("Could not determine Android arch") ;;
       esac
      ;;
diff --git a/depends/README.md b/depends/README.md
index 47da59fac5..0e0b3da0cf 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -35,7 +35,6 @@ Common `host-platform-triplets` for cross compilation are:
 - `s390x-linux-gnu` for Linux S390X
 - `armv7a-linux-android` for Android ARM 32 bit
 - `aarch64-linux-android` for Android ARM 64 bit
-- `i686-linux-android` for Android x86 32 bit
 - `x86_64-linux-android` for Android x86 64 bit
 
 The paths are automatically configured and no other options are needed unless targeting [Android](#Android).
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 7c64e8b65d..ac66191045 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -185,7 +185,6 @@ $(package)_config_opts_android += -no-feature-vulkan
 $(package)_config_opts_aarch64_android += -android-arch arm64-v8a
 $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a
 $(package)_config_opts_x86_64_android += -android-arch x86_64
-$(package)_config_opts_i686_android += -android-arch i686
 endef
 
 define $(package)_fetch_cmds