Merge pull request #28 from rokuz/lvk_android_fix

Fix Android samples

.github/workflows/c-cpp.yml

@@ -16,7 +16,7 @@ jobs:
           submodules: recursive
 
       - name: Set up NDK
-        uses: nttld/setup-ndk@v1
+        uses: nttld/setup-ndk@v1.4.2
         with:
           ndk-version: r26b
 
@@ -60,6 +60,12 @@ jobs:
           chmod +x ./gradlew
           ./gradlew assembleDebug
 
+      - name: Assemble 003_RenderToCubeMapSinglePass APK
+        run: |
+          cd build/android/003_RenderToCubeMapSinglePass
+          chmod +x ./gradlew
+          ./gradlew assembleDebug
+
   cmake-build:
       strategy:
         fail-fast: false

CMakeLists.txt

@@ -24,7 +24,7 @@ option(LVK_WITH_ANDROID_VALIDATION "Enable validation layers on Android"     ON)
 
 cmake_dependent_option(LVK_WITH_VULKAN_PORTABILITY "Enable portability extension" ON "APPLE" OFF)
 
-set(LVK_ANDROID_ABI "\'arm64-v8a\'" CACHE STRING "Enabled ABI on Android")
+set(LVK_ANDROID_ABI "arm64-v8a" CACHE STRING "Enabled ABI on Android")
 set(LVK_CUSTOM_MOLTENVK_PATH "" CACHE STRING "Path to custom MoltenVK")
 # cmake-format: on
 

android/app/AndroidManifest.xml.in

@@ -13,7 +13,7 @@
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:label="@APP_NAME@">
+        android:label="lvk_@APP_NAME@">
         <activity
             android:exported="true"
             android:name="org.lvk.samples.MainActivity"

android/app/build.gradle.in

@@ -7,7 +7,7 @@ android {
   compileSdk 34
 
   defaultConfig {
-    applicationId "org.lvk.samples.@APP_NAME@"
+    applicationId "org.lvk.samples.lvk_@APP_NAME@"
     minSdk 24
     targetSdk 34
     versionCode 1

samples/001_HelloTriangle.cpp

@@ -191,7 +191,7 @@ void android_main(android_app* app) {
     if (ctx_) {
       render();
     }
-    if (ALooper_pollAll(0, nullptr, &events, (void**)&source) >= 0) {
+    if (ALooper_pollOnce(0, nullptr, &events, (void**)&source) >= 0) {
       if (source) {
         source->process(app, source);
       }

samples/002_RenderToCubeMap.cpp

@@ -345,7 +345,7 @@ void android_main(android_app* app) {
     if (ctx_) {
       render((float)newTimeSec);
     }
-    if (ALooper_pollAll(0, nullptr, &events, (void**)&source) >= 0) {
+    if (ALooper_pollOnce(0, nullptr, &events, (void**)&source) >= 0) {
       if (source) {
         source->process(app, source);
       }

samples/003_RenderToCubeMapSinglePass.cpp

@@ -359,7 +359,7 @@ void android_main(android_app* app) {
     if (ctx_) {
       render((float)newTimeSec);
     }
-    if (ALooper_pollAll(0, nullptr, &events, (void**)&source) >= 0) {
+    if (ALooper_pollOnce(0, nullptr, &events, (void**)&source) >= 0) {
       if (source) {
         source->process(app, source);
       }

samples/CMakeLists.txt

@@ -57,7 +57,16 @@ macro(ADD_DEMO app)
            DESTINATION "${CMAKE_BINARY_DIR}/android/${app}/gradle/wrapper")
 
       set(APP_NAME ${app})
-      set(ANDROID_ABI_FILTERS ${LVK_ANDROID_ABI})
+
+      set(ABI_STRING "")
+      foreach(str ${LVK_ANDROID_ABI})
+        if(NOT ${ABI_STRING} STRLESS "")
+          set(ABI_STRING "${ABI_STRING}, ")
+        endif()
+        set(ABI_STRING "${ABI_STRING}'${str}'")
+      endforeach()
+      set(ANDROID_ABI_FILTERS ${ABI_STRING})
+
       configure_file("${LVK_ROOT_DIR}/android/settings.gradle.in"
                      "${CMAKE_BINARY_DIR}/android/${app}/settings.gradle")
       configure_file("${LVK_ROOT_DIR}/android/app/build.gradle.in"
@@ -70,7 +79,7 @@ macro(ADD_DEMO app)
       if(LVK_WITH_ANDROID_VALIDATION)
         list(APPEND abdroid_abi arm64-v8a armeabi-v7a x86 x86_64)
         foreach(abi ${abdroid_abi})
-          string(FIND ${LVK_ANDROID_ABI} "${abi}" abi_substr_index)
+          string(FIND ${ABI_STRING} "${abi}" abi_substr_index)
           if(abi_substr_index GREATER -1)
             file(COPY "${LVK_ROOT_DIR}/third-party/deps/src/android-validation-layers/${abi}/libVkLayer_khronos_validation.so"
                  DESTINATION "${CMAKE_BINARY_DIR}/android/${app}/app/src/main/jniLibs/${abi}")

samples/Tiny.cpp

@@ -235,7 +235,7 @@ void android_main(android_app* app) {
     if (ctx_) {
       vk.render();
     }
-    if (ALooper_pollAll(0, nullptr, &events, (void**)&source) >= 0) {
+    if (ALooper_pollOnce(0, nullptr, &events, (void**)&source) >= 0) {
       if (source) {
         source->process(app, source);
       }

samples/Tiny_Mesh.cpp

@@ -560,7 +560,7 @@ void android_main(android_app* app) {
     if (ctx_) {
       render(frameIndex, (float)newTimeSec);
     }
-    if (ALooper_pollAll(0, nullptr, &events, (void**)&source) >= 0) {
+    if (ALooper_pollOnce(0, nullptr, &events, (void**)&source) >= 0) {
       if (source) {
         source->process(app, source);
       }

samples/Tiny_MeshLarge.cpp

@@ -2341,7 +2341,7 @@ void android_main(android_app* app) {
       render(delta, frameIndex);
       processLoadedMaterials();
     }
-    if (ALooper_pollAll(0, nullptr, &events, (void**)&source) >= 0) {
+    if (ALooper_pollOnce(0, nullptr, &events, (void**)&source) >= 0) {
       if (source) {
         source->process(app, source);
       }

third-party/bootstrap-deps.json

@@ -17,10 +17,6 @@
         "type": "git",
         "url": "https://github.com/KhronosGroup/glslang.git",
         "revision": "14.1.0"
-    },
-    "postprocess": {
-       "type": "script",
-       "file": "glslang.py"
     }
 },
 {