Github android testing #3

gershnik · Nov 3, 2023 · 4d3a134 · 4d3a134
1 parent ea7cbed
commit 4d3a134
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -174,6 +174,7 @@ jobs:
         arch: ${{env.NDK_ARCH}}
         target: google_apis
         ndk: ${{env.NDK_VER}}
+        sdcard-path-or-size: 1000M
         force-avd-creation: false
         emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: false
@@ -186,6 +187,7 @@ jobs:
         arch: ${{env.NDK_ARCH}}
         target: google_apis
         ndk: ${{env.NDK_VER}}
+        sdcard-path-or-size: 1000M
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         script: |

diff --git a/tests/android/CMakeLists.txt b/tests/android/CMakeLists.txt
@@ -20,8 +20,7 @@ find_package (Python3 COMPONENTS Interpreter REQUIRED)
 
 add_custom_target(javabuild  
     DEPENDS build-jnigen  
-    COMMAND ./gradlew --no-daemon -Porg.gradle.jvmargs='-Xmx2048m -Dfile.encoding=UTF-8' -Pandroid.useAndroidX=true 
-        -PbuildDir=${CMAKE_CURRENT_BINARY_DIR}/gradle :app:compileDebugJavaWithJavac
+    COMMAND ./gradlew --no-daemon -PbuildDir=${CMAKE_CURRENT_BINARY_DIR}/gradle :app:compileDebugJavaWithJavac
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 )
 
@@ -31,8 +30,7 @@ add_custom_target(androidbuild ALL
     DEPENDS javabuild smjnitests 
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_LIST_DIR}/app/libs/${ANDROID_ABI}
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:smjnitests> ${CMAKE_CURRENT_LIST_DIR}/app/libs/${ANDROID_ABI}/$<TARGET_FILE_NAME:smjnitests>
-    COMMAND ./gradlew --no-daemon -Porg.gradle.jvmargs='-Xmx2048m -Dfile.encoding=UTF-8' -Pandroid.useAndroidX=true 
-        -PbuildDir=${CMAKE_CURRENT_BINARY_DIR}/gradle :app:assembleDebug
+    COMMAND ./gradlew --no-daemon -PbuildDir=${CMAKE_CURRENT_BINARY_DIR}/gradle :app:assembleDebug
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 )