aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Schuchardt <mikes@lunarg.com>2024-08-03 14:37:42 -0700
committerCharles Giessen <46324611+charles-lunarg@users.noreply.github.com>2024-08-03 17:44:51 -0500
commit7d5cdf62e4f2935425faab1270fe1c9a401fa664 (patch)
treefa0d21907e438789a68e2e91221278fc4aeb9926
parent3d70a8c398c68a6ee75fb3755cb3a55294ef9c1d (diff)
downloadusermoji-7d5cdf62e4f2935425faab1270fe1c9a401fa664.tar.xz
cube: Change ALooper_pollOnce to ALooper_pollAll
ALooper_pollAll is removed in NDK r27, switch to using ALooper_pollOnce instead. Since it was already being called in a loop, all we have to do is change the function name. Fixes #1015
-rw-r--r--.github/workflows/tools.yml3
-rw-r--r--cube/cube.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
index 38e5c9ac..aae55840 100644
--- a/.github/workflows/tools.yml
+++ b/.github/workflows/tools.yml
@@ -178,9 +178,6 @@ jobs:
python-version: '3.8'
- uses: lukka/get-cmake@latest
- name: Configure
- env:
- # workaround for https://github.com/KhronosGroup/Vulkan-Tools/issues/1015
- ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653
run: |
cmake -S . -B build/ --toolchain $ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \
-D ANDROID_PLATFORM=23 \
diff --git a/cube/cube.c b/cube/cube.c
index b965964e..5cb15dce 100644
--- a/cube/cube.c
+++ b/cube/cube.c
@@ -4505,7 +4505,7 @@ void android_main(struct android_app *app) {
while (1) {
int events;
struct android_poll_source *source;
- while (ALooper_pollAll(active ? 0 : -1, NULL, &events, (void **)&source) >= 0) {
+ while (ALooper_pollOnce(active ? 0 : -1, NULL, &events, (void **)&source) >= 0) {
if (source) {
source->process(app, source);
}