chore: update the building script

x-tools-author · Nov 25, 2023 · 1fd6128 · 1fd6128
1 parent 9c4a890
commit 1fd6128
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -3,10 +3,7 @@ on: push
 #  schedule:
 #    - cron: '0 0 * * *'
 env:
-  JAVA_HOME: $JAVA_HOME_11_X64
   CMAKE_MAKE_PROGRAM: ${{ github.workspace }}/resources/tools/ninja.exe
-  ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT
-  ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT
 
 jobs:
   build:
@@ -31,12 +28,13 @@ jobs:
       - name: Build for Android
         shell: cmd
         run: |
+          set JAVA_HOME=%JAVA_HOME_11_X64%
           ${{ github.workspace }}\Qt\${{matrix.version}}\${{matrix.arch}}\bin\qt-cmake.bat ^
           -G Ninja ^
           -S . ^
           -B "build\armeabi_v7a" ^
           -DCMAKE_BUILD_TYPE:STRING=Release ^
           -DCMAKE_MAKE_PROGRAM:FILEPATH="${{env.CMAKE_MAKE_PROGRAM}}" ^
-          -DCMAKE_CXX_COMPILER:FILEPATH="${{env.ANDROID_NDK_ROOT}}/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" ^
-          -DANDROID_SDK_ROOT:PATH="${{env.ANDROID_SDK_ROOT}}" ^
-          -DANDROID_NDK_ROOT="${{env.ANDROID_NDK_ROOT}}"
+          -DCMAKE_CXX_COMPILER:FILEPATH="%ANDROID_NDK_ROOT%/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" ^
+          -DANDROID_SDK_ROOT:PATH="%ANDROID_SDK_ROOT%" ^
+          -DANDROID_NDK_ROOT="%ANDROID_NDK_ROOT%"