aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authormerge-script <fanquake@gmail.com>2024-05-30 09:25:42 +0100
committermerge-script <fanquake@gmail.com>2024-05-30 09:25:42 +0100
commitf61ede574c12f1f8ae67f38f15387586719c856f (patch)
tree2cce94c6af91ba06686d14437dda02da4fef0f82 /depends
parent10164916f712bd3c92f0b3ac329ba2e1209746fe (diff)
parent5deb0b024e14c7c63d405c651d1ca323560a1c21 (diff)
downloadbitcoin-f61ede574c12f1f8ae67f38f15387586719c856f.tar.xz
Merge bitcoin/bitcoin#30049: build, test, doc: Temporarily remove Android-related stuff
5deb0b024e14c7c63d405c651d1ca323560a1c21 build, test, doc: Temporarily remove Android-related stuff (Hennadii Stepanov) Pull request description: Previously, our Android builds were geared towards generating APKs, which relied on Qt. However, after migrating to C++20, compiling for Android became unfeasible due to Qt 5.15's compatibility limitations with NDK only up to r25, which includes an outdated embedded libc++ (see https://github.com/bitcoin/bitcoin/issues/29360). All removed stuff will be reinstated after migrating the build system to CMake and upgrading Qt to version 6.x. This PR makes possible a clean migration to the CMake-based build system as it removes code, which is not used at this moment. ACKs for top commit: vasild: ACK 5deb0b024e14c7c63d405c651d1ca323560a1c21 fanquake: ACK 5deb0b024e14c7c63d405c651d1ca323560a1c21 - given none of this is currently tested/wont compile. Can be revisted in future. Tree-SHA512: 3bc2ccfe881e11cc1d78c27acd6f1d86cfba86821ef3bb5eca2e80d978fdfa13659ec82284dcaadc507e2394524dea91d4b8f81d0030c1cef9708df8be76bf07
Diffstat (limited to 'depends')
-rw-r--r--depends/Makefile4
-rw-r--r--depends/README.md5
-rw-r--r--depends/hosts/android.mk15
-rw-r--r--depends/packages/packages.mk2
-rw-r--r--depends/packages/qt.mk20
-rw-r--r--depends/patches/qt/fix_android_jni_static.patch17
6 files changed, 1 insertions, 62 deletions
diff --git a/depends/Makefile b/depends/Makefile
index 6883c0f971..fee426d8db 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -101,10 +101,6 @@ host_os+=$(findstring netbsd,$(full_host_os))
host_os+=$(findstring openbsd,$(full_host_os))
host_os+=$(findstring mingw32,$(full_host_os))
-ifeq (android,$(findstring android,$(full_host_os)))
-host_os:=android
-endif
-
host_os:=$(strip $(host_os))
ifeq ($(host_os),)
host_os=$(full_host_os)
diff --git a/depends/README.md b/depends/README.md
index 10e0985cf4..17def65d3e 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -38,11 +38,8 @@ 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
-- `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).
+The paths are automatically configured and no other options are needed.
### Install the required dependencies: Ubuntu & Debian
diff --git a/depends/hosts/android.mk b/depends/hosts/android.mk
deleted file mode 100644
index a1c8c56dba..0000000000
--- a/depends/hosts/android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-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_CFLAGS=-std=$(C_STANDARD)
-android_CXXFLAGS=-std=$(CXX_STANDARD)
-
-android_AR=$(ANDROID_TOOLCHAIN_BIN)/llvm-ar
-android_RANLIB=$(ANDROID_TOOLCHAIN_BIN)/llvm-ranlib
-
-android_cmake_system=Android
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 6e9180f546..ca54093339 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -5,12 +5,10 @@ boost_packages = boost
libevent_packages = libevent
qrencode_linux_packages = qrencode
-qrencode_android_packages = qrencode
qrencode_darwin_packages = qrencode
qrencode_mingw32_packages = qrencode
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
-qt_android_packages=qt
qt_darwin_packages=qt
qt_mingw32_packages=qt
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 0bf0c0036a..146e895c5a 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -12,7 +12,6 @@ $(package)_patches += qttools_src.pro
$(package)_patches += mac-qmake.conf
$(package)_patches += fix_qt_pkgconfig.patch
$(package)_patches += no-xlib.patch
-$(package)_patches += fix_android_jni_static.patch
$(package)_patches += dont_hardcode_pwd.patch
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
$(package)_patches += no_warnings_for_symbols.patch
@@ -186,24 +185,6 @@ $(package)_config_opts_mingw32 += -pch
ifneq ($(LTO),)
$(package)_config_opts_mingw32 += -ltcg
endif
-
-$(package)_config_opts_android = -xplatform android-clang
-$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
-$(package)_config_opts_android += -android-ndk $(ANDROID_NDK)
-$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
-$(package)_config_opts_android += -egl
-$(package)_config_opts_android += -no-dbus
-$(package)_config_opts_android += -opengl es2
-$(package)_config_opts_android += -qt-freetype
-$(package)_config_opts_android += -no-fontconfig
-$(package)_config_opts_android += -L $(host_prefix)/lib
-$(package)_config_opts_android += -I $(host_prefix)/include
-$(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
endef
define $(package)_fetch_cmds
@@ -244,7 +225,6 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/fix-macos-linker.patch && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
- patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \
diff --git a/depends/patches/qt/fix_android_jni_static.patch b/depends/patches/qt/fix_android_jni_static.patch
deleted file mode 100644
index 79824f244a..0000000000
--- a/depends/patches/qt/fix_android_jni_static.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
-+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
-@@ -979,6 +979,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
- __android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
- return -1;
- }
-+
-+ const jint ret = QT_PREPEND_NAMESPACE(QtAndroidPrivate::initJNI(vm, env));
-+ if (ret != 0)
-+ {
-+ __android_log_print(ANDROID_LOG_FATAL, "Qt", "initJNI failed");
-+ return ret;
-+ }
-+
- QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
-
- m_javaVM = vm;