Pārlūkot izejas kodu

Android: Update to latest SDK and NDK

Jorrit Rouwe 4 nedēļas atpakaļ
vecāks
revīzija
550ae1e71a

+ 3 - 3
Build/Android/PerformanceTest/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk = 33
-    ndkVersion = "26.1.10909125"
+    compileSdk = 36
+    ndkVersion = "29.0.14206865"
 
     defaultConfig {
         applicationId = "com.joltphysics.performancetest"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
         ndk.abiFilters = ['arm64-v8a', 'armeabi-v7a', 'x86_64', 'x86']

+ 3 - 3
Build/Android/UnitTests/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk = 33
-    ndkVersion = "26.1.10909125"
+    compileSdk = 36
+    ndkVersion = "29.0.14206865"
 
     defaultConfig {
         applicationId = "com.joltphysics.unittests"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
         ndk.abiFilters = ['arm64-v8a', 'armeabi-v7a', 'x86_64', 'x86']

+ 1 - 1
UnitTests/UnitTestFramework.cpp

@@ -352,7 +352,7 @@ void android_main(struct android_app *ioApp)
 	android_poll_source *source;
 	do
 	{
-		if (ALooper_pollAll(1, nullptr, &events, (void **)&source) >= 0 && source != nullptr)
+		if (ALooper_pollOnce(1, nullptr, &events, (void **)&source) >= 0 && source != nullptr)
 			source->process(ioApp, source);
 	} while (ioApp->destroyRequested == 0);
 }