workaround for the inflexible cmake-arguments of android

pionere · Dec 5, 2023 · c200ed9 · c200ed9
1 parent 1b10561
commit c200ed9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -482,16 +482,16 @@ jobs:
         #name: [diablo, hellfire]
         include:
           - name: diablo
-            cmakeargs: ''
             artifact: 'diablo-nightly-android.apk'
           - name: hellfire
-            cmakeargs: '-DHELLFIRE=ON'
+            cmakearg0: '-DHELLFIRE=ON'
             artifact: 'hellfire-nightly-android.apk'
           - name: diablo-adrp
-            cmakeargs: '-D USE_PATCH=ON'
+            cmakearg0: '-DUSE_PATCH=ON'
             artifact: 'diablo-nightly-androidp.apk'
           - name: hellfire-adrp
-            cmakeargs: '-D USE_PATCH=ON -DHELLFIRE=ON'
+            cmakearg0: '-DUSE_PATCH=ON'
+            cmakearg1: '-DHELLFIRE=ON'
             artifact: 'hellfire-nightly-androidp.apk'
     runs-on: ubuntu-latest
     steps:
@@ -525,7 +525,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}
       shell: bash
-      run: cd android-project && ./gradlew assembleRelease -Pcmakeargs="${{ matrix.cmakeargs }}"
+      run: cd android-project && ./gradlew assembleRelease -Pcmakearg0="${{ matrix.cmakearg0 }}" -Pcmakearg1="${{ matrix.cmakearg1 }}" -Pcmakearg2="${{ matrix.cmakearg2 }}"
 
     - name: Upload-Package
       uses: actions/upload-artifact@v3

diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
@@ -26,7 +26,7 @@ android {
 		versionName "1.0.0"
 		externalNativeBuild {
 			cmake {
-				arguments "-DANDROID_STL=c++_static", project.findProperty("cmakeargs")
+				arguments "-DANDROID_STL=c++_static", project.findProperty("cmakearg0"), project.findProperty("cmakearg1"), project.findProperty("cmakearg2")
 				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 			}
 		}