diff options
| author | Igor Cota <igor@foundationdevices.com> | 2021-12-12 08:17:12 +0100 |
|---|---|---|
| committer | Igor Cota <igor@foundationdevices.com> | 2021-12-13 19:27:46 +0100 |
| commit | 27f353d8efca19bc2f7dc79b09d4737c9401a768 (patch) | |
| tree | b7546544926f14d73c139cbdf1355fc87077b9c6 /src/Makefile.qt.include | |
| parent | 6fc5c772d47cca01968c451f070f997c9f7641e0 (diff) | |
build, android: Fix Android GUI not loading on Qt 5.15
Qt 5.14 introduced certain breaking changes to the way it parses
AndroidManifest.xml metadata
https://lists.qt-project.org/pipermail/interest/2020-January/034372.html
Diffstat (limited to 'src/Makefile.qt.include')
| -rw-r--r-- | src/Makefile.qt.include | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 35d5b0004a..6c0e6f7c6f 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -394,8 +394,7 @@ bitcoin_qt_apk: FORCE cp $(dir $(lastword $(CC)))../sysroot/usr/lib/$(host_alias)/libc++_shared.so $(APK_LIB_DIR) tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/jar/src --strip-components=5 tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/java/src --strip-components=5 - tar xf $(QT_BASE_PATH) -C qt/android/res/ $(QT_BASE_TLD)src/android/java/res --strip-components=5 - cp qt/bitcoin-qt $(APK_LIB_DIR)/libbitcoin-qt.so + cp qt/bitcoin-qt $(APK_LIB_DIR)/libbitcoin-qt_$(ANDROID_ARCH).so cd qt/android && gradle wrapper --gradle-version=6.6.1 cd qt/android && ./gradlew build |