Skip to content

Commit ab8be7b

Browse files
committed
fix: hard build libxray
1 parent f294195 commit ab8be7b

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

.github/workflows/deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ jobs:
715715
716716
for abi in arm64-v8a armeabi-v7a x86 x86_64; do
717717
for build_type in Release Debug; do
718-
cmake -S . -B build_${abi//-/_} "${args[@]}" "-DCMAKE_ANDROID_ARCH_ABI=$abi" "-DCMAKE_BUILD_TYPE=$build_type"
718+
cmake -S . -B build_${abi//-/_} "${args[@]}" "-DCMAKE_ANDROID_ARCH_ABI=$abi" "-DCMAKE_BUILD_TYPE=$build_type" "-DCONAN_INSTALL_ARGS=--build=missing;--build=amnezia-libxray"
719719
done
720720
done
721721
@@ -848,6 +848,7 @@ jobs:
848848
QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
849849
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
850850
ANDROID_NDK_VERSION: ${{ env.NDK_VERSION }}
851+
CONAN_INSTALL_ARGS: "--build=missing;--build=amnezia-libxray"
851852
shell: bash
852853
run: |
853854
deploy/build.sh -t android --sign --aab

deploy/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ args=()
206206
[[ -n "$QT_ANDROID_ABIS" ]] && args+=("-DQT_ANDROID_ABIS=$QT_ANDROID_ABIS")
207207
[[ -n "$QT_ANDROID_BUILD_ALL_ABIS" ]] && args+=("-DQT_ANDROID_BUILD_ALL_ABIS=$QT_ANDROID_BUILD_ALL_ABIS")
208208
[[ -n "$BUILD_PLAY" ]] && args+=("-DANDROID_BUILD_PLAY=ON")
209+
[[ -n "$CONAN_INSTALL_ARGS" ]] && args+=("-DCONAN_INSTALL_ARGS=$CONAN_INSTALL_ARGS")
209210

210211
if [[ -n "$FORCE" ]]; then
211212
run_traced rm -rf "$BUILD_PATH"

recipes/amnezia-libxray/conanfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ def build(self):
5959
self.run("bash build.sh android")
6060
else:
6161
self.run("./build.sh android")
62+
if not os.path.isfile(os.path.join(self.build_folder, "libxray.aar")):
63+
raise Exception("libxray.aar was not produced by the build script")
6264

6365
def package(self):
6466
copy(self, "libxray.aar", src=self.build_folder, dst=os.path.join(self.package_folder, "aar"))

0 commit comments

Comments
 (0)