Skip to content

Commit cc5962d

Browse files
committed
Fix FitPro APK ABI packaging
1 parent e7abaeb commit cc5962d

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

.github/workflows/main.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,6 +2304,11 @@ jobs:
23042304
sed -i 's/property string ${{ matrix.variant.setting_key }}: ""/property string ${{ matrix.variant.setting_key }}: "${{ matrix.variant.setting_value }}"/' settings.qml
23052305
cd ..
23062306
2307+
# Keep FitPro APKs usable on older 32-bit iFIT/ProForm consoles.
2308+
# qmake reads defaults.pri while generating the Android deployment JSON,
2309+
# so force all ABIs there before the build starts.
2310+
sed -i 's/^ANDROID_ABIS = .*/ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64/' defaults.pri
2311+
23072312
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK
23082313
rm -rf /usr/local/lib/android/sdk/ndk/25.1.8937393
23092314
lrelease src/qdomyos-zwift.pri
@@ -2349,6 +2354,11 @@ jobs:
23492354
fi
23502355
"$GRADLE_DIST_DIR/bin/gradle" -g "$GRADLE_USER_HOME" --no-daemon -p ${{ github.workspace }}/output/android assembleDebug bundleDebug
23512356
mv ${{ github.workspace }}/output/android/build/outputs/apk/debug/android-debug.apk ${{ github.workspace }}/output/android/build/outputs/apk/debug/android-debug-fitpro-${{ matrix.variant.name }}.apk
2357+
APK="${{ github.workspace }}/output/android/build/outputs/apk/debug/android-debug-fitpro-${{ matrix.variant.name }}.apk"
2358+
for ABI in armeabi-v7a arm64-v8a x86 x86_64; do
2359+
unzip -l "$APK" "lib/$ABI/libqdomyos-zwift_$ABI.so"
2360+
unzip -l "$APK" "lib/$ABI/libQt5Core_$ABI.so"
2361+
done
23522362
23532363
- name: Archive fitpro binary
23542364
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)