diff options
| author | merge-script <fanquake@gmail.com> | 2024-05-30 09:25:42 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-05-30 09:25:42 +0100 |
| commit | f61ede574c12f1f8ae67f38f15387586719c856f (patch) | |
| tree | 2cce94c6af91ba06686d14437dda02da4fef0f82 /depends/packages/packages.mk | |
| parent | 10164916f712bd3c92f0b3ac329ba2e1209746fe (diff) | |
| parent | 5deb0b024e14c7c63d405c651d1ca323560a1c21 (diff) | |
| download | bitcoin-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/packages/packages.mk')
| -rw-r--r-- | depends/packages/packages.mk | 2 |
1 files changed, 0 insertions, 2 deletions
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 |