build, qt: Drop Android 32-bit support

bitcoin · Dec 12, 2021 · 86afe77 · 86afe77
1 parent 50c502f
commit 86afe77
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/configure.ac b/configure.ac
@@ -773,13 +773,7 @@ case $host in
         *aarch64*)
           ANDROID_ARCH=arm64-v8a
           ;;
-        *armv7a*)
-          ANDROID_ARCH=armeabi-v7a
-          ;;
-        *i686*)
-          ANDROID_ARCH=i686
-          ;;
-        *) AC_MSG_ERROR([Could not determine Android arch]) ;;
+        *) AC_MSG_ERROR([Could not determine Android arch, or it is unsupported]) ;;
       esac
      ;;
    *linux*)

diff --git a/depends/README.md b/depends/README.md
@@ -36,9 +36,7 @@ Common `host-platform-triplet`s for cross compilation are:
 - `riscv32-linux-gnu` for Linux RISC-V 32 bit
 - `riscv64-linux-gnu` for Linux RISC-V 64 bit
 - `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](../doc/build-android.md).

diff --git a/depends/hosts/android.mk b/depends/hosts/android.mk
@@ -1,10 +1,5 @@
-ifeq ($(HOST),armv7a-linux-android)
-android_CXX=$(ANDROID_TOOLCHAIN_BIN)/$(HOST)eabi$(ANDROID_API_LEVEL)-clang++
-android_CC=$(ANDROID_TOOLCHAIN_BIN)/$(HOST)eabi$(ANDROID_API_LEVEL)-clang
-else
 android_CXX=$(ANDROID_TOOLCHAIN_BIN)/$(HOST)$(ANDROID_API_LEVEL)-clang++
 android_CC=$(ANDROID_TOOLCHAIN_BIN)/$(HOST)$(ANDROID_API_LEVEL)-clang
-endif
 android_AR=$(ANDROID_TOOLCHAIN_BIN)/llvm-ar
 android_RANLIB=$(ANDROID_TOOLCHAIN_BIN)/llvm-ranlib
 

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
@@ -180,9 +180,7 @@ $(package)_config_opts_android += -pch
 $(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