Skip to content

Commit 583cf73

Browse files
committed
Fix Android APK ABI packaging
1 parent cc5962d commit 583cf73

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

.github/workflows/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,9 @@ jobs:
710710
711711
- name: Build QZ for Android (4 ABIs)
712712
run: |
713+
# qmake reads defaults.pri while generating the Android deployment JSON,
714+
# so force all ABIs there before the build starts.
715+
sed -i 's/^ANDROID_ABIS = .*/ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64/' defaults.pri
713716
lrelease src/qdomyos-zwift.pri
714717
qmake -spec android-clang 'ANDROID_ABIS=armeabi-v7a arm64-v8a x86 x86_64' 'ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/21.4.7075529' && make -j4 && make INSTALL_ROOT=${{ github.workspace }}/output/android/ install
715718
sed -i '1s|{|{\n "android-extra-libs": "${{ github.workspace }}/android_openssl/no-asm/latest/arm/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm64/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm64/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86_64/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86_64/libssl_1_1.so",|' src/android-qdomyos-zwift-deployment-settings.json
@@ -751,6 +754,11 @@ jobs:
751754
unzip -q /tmp/gradle-8.13-bin.zip -d ${{ github.workspace }}
752755
fi
753756
"$GRADLE_DIST_DIR/bin/gradle" -g "$GRADLE_USER_HOME" --no-daemon -p ${{ github.workspace }}/output/android assembleDebug bundleDebug
757+
APK="${{ github.workspace }}/output/android/build/outputs/apk/debug/android-debug.apk"
758+
for ABI in armeabi-v7a arm64-v8a x86 x86_64; do
759+
unzip -l "$APK" "lib/$ABI/libqdomyos-zwift_$ABI.so"
760+
unzip -l "$APK" "lib/$ABI/libQt5Core_$ABI.so"
761+
done
754762
755763
- name: Re-sign APK for stable App Links fingerprint
756764
run: |

0 commit comments

Comments
 (0)