Skip to content

Commit 27f353d

Browse files
committed
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
1 parent 6fc5c77 commit 27f353d

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

src/Makefile.qt.include

+1-2
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,7 @@ bitcoin_qt_apk: FORCE
394394
cp $(dir $(lastword $(CC)))../sysroot/usr/lib/$(host_alias)/libc++_shared.so $(APK_LIB_DIR)
395395
tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/jar/src --strip-components=5
396396
tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/java/src --strip-components=5
397-
tar xf $(QT_BASE_PATH) -C qt/android/res/ $(QT_BASE_TLD)src/android/java/res --strip-components=5
398-
cp qt/bitcoin-qt $(APK_LIB_DIR)/libbitcoin-qt.so
397+
cp qt/bitcoin-qt $(APK_LIB_DIR)/libbitcoin-qt_$(ANDROID_ARCH).so
399398
cd qt/android && gradle wrapper --gradle-version=6.6.1
400399
cd qt/android && ./gradlew build
401400

src/qt/android/.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
/.gradle
22
/build
3-
/gradle/wrapper
3+
/gradle
44
/gradlew*
55
/libs
6-
/res/layout
7-
/res/values*
86
/src/org/kde
97
/src/org/qtproject

src/qt/android/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
<meta-data android:name="android.app.background_running" android:value="true"/>
3333
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="true"/>
3434
<meta-data android:name="android.app.extract_android_style" android:value="default"/>
35-
</activity>
35+
<meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
36+
</activity>
3637

3738
</application>
3839
</manifest>

src/qt/android/res/values/libs.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<array name="load_local_libs">
4+
<item>
5+
arm64-v8a;libbitcoin-qt_arm64-v8a.so
6+
</item>
7+
<item>
8+
armeabi-v7a;libbitcoin-qt_armeabi-v7a.so
9+
</item>
10+
<item>
11+
x86_64;libbitcoin-qt_x86_64.so
12+
</item>
13+
<item>
14+
x86;libbitcoin-qt_x86.so
15+
</item>
16+
</array>
17+
</resources>

0 commit comments

Comments
 (0)