diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a4552a247..4c1c1e89e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -278,6 +278,7 @@ jobs: - name: 'Build project' run: | + export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }} //gcc_64" export NDK_VERSION=21d export ANDROID_NDK_PLATFORM=android-21 export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION} diff --git a/deploy/build_android.sh b/deploy/build_android.sh index 9071099fe..150897556 100644 --- a/deploy/build_android.sh +++ b/deploy/build_android.sh @@ -40,14 +40,12 @@ echo "Using Android NDK in $ANDROID_NDK_ROOT" $QT_BIN_DIR/qmake -v $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v -QT_HOST_PATH = $HOME/Qt/$QT_VERSION/gcc_64/bin - # Build App echo "Building App..." cd $BUILD_DIR $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -cmake --build . --config release +cmake -DQT_HOST_PATH=$QT_HOST_PATH --build . --config release # $QT_BIN_DIR/qmake -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro # echo "Executing make... may take long time"