Android fixes

armorpaint/sources/make_mesh.ts

@@ -394,7 +394,7 @@ function make_mesh_run(data: material_t, layer_pass: i32 = 0): node_shader_conte
 			}
 			else { // Deferred, Pathtraced
 				if (make_material_emis_used) {
-					node_shader_write_frag(kong, "if (int(matid * 255.0) % float(3) == 1) { basecol *= 10.0; }"); // Boost for bloom
+					node_shader_write_frag(kong, "if (float(int(matid * 255.0)) % float(3) == 1.0) { basecol = basecol * 10.0; }"); // Boost for bloom
 				}
 				node_shader_write_frag(kong, "output[1] = float4(basecol, occlusion);");
 			}
@@ -421,11 +421,11 @@ function make_mesh_run(data: material_t, layer_pass: i32 = 0): node_shader_conte
 			node_shader_write_frag(kong, "output[1] = float4(float3(height, height, height), 1.0);");
 		}
 		else if (context_raw.viewport_mode == viewport_mode_t.EMISSION) {
-			node_shader_write_frag(kong, "float emis = int(matid * 255.0) % float(3) == 1 ? 1.0 : 0.0;");
+			node_shader_write_frag(kong, "float emis = float(int(matid * 255.0)) % float(3) == 1 ? 1.0 : 0.0;");
 			node_shader_write_frag(kong, "output[1] = float4(float3(emis, emis, emis), 1.0);");
 		}
 		else if (context_raw.viewport_mode == viewport_mode_t.SUBSURFACE) {
-			node_shader_write_frag(kong, "float subs = int(matid * 255.0) % float(3) == 2 ? 1.0 : 0.0;");
+			node_shader_write_frag(kong, "float subs = float(int(matid * 255.0)) % float(3) == 2 ? 1.0 : 0.0;");
 			node_shader_write_frag(kong, "output[1] = float4(float3(subs, subs, subs), 1.0);");
 		}
 		else if (context_raw.viewport_mode == viewport_mode_t.TEXCOORD) {

base/project.js

@@ -223,7 +223,6 @@ if (!flags.lite) {
 		project.add_cfiles("sources/backends/android_native_app_glue.c");
 		project.add_define("IRON_ANDROID");
 		project.add_define("IRON_VULKAN");
-		project.add_define("IRON_ANDROID_API=24");
 		project.add_define("VK_USE_PLATFORM_ANDROID_KHR");
 		project.add_lib("vulkan");
 		project.add_lib("log");
@@ -304,9 +303,9 @@ else if (platform === "android") {
 	project.target_options.android.package = flags.package;
 	project.target_options.android.permissions = ["android.permission.WRITE_EXTERNAL_STORAGE", "android.permission.READ_EXTERNAL_STORAGE", "android.permission.INTERNET"];
 	project.target_options.android.screenOrientation = ["sensorLandscape"];
-	project.target_options.android.minSdkVersion = 30;
-	project.target_options.android.targetSdkVersion = 33;
-	project.target_options.android.versionCode = 240000;
+	project.target_options.android.minSdkVersion = 33;
+	project.target_options.android.targetSdkVersion = 36;
+	project.target_options.android.versionCode = 250601;
 	project.target_options.android.versionName = "1.0 alpha";
 }
 else if (platform === "ios") {

base/sources/backends/android_system.c

@@ -11,6 +11,7 @@
 #include <iron_video.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <vulkan/vulkan_android.h>
 #include <vulkan/vulkan_core.h>
@@ -1083,7 +1084,7 @@ bool iron_internal_handle_messages(void) {
 	int events;
 	struct android_poll_source *source;
 
-	while ((ident = ALooper_pollAll(paused ? -1 : 0, NULL, &events, (void **)&source)) >= 0) {
+	while ((ident = ALooper_pollOnce(paused ? -1 : 0, NULL, &events, (void **)&source)) >= 0) {
 		if (source != NULL) {
 			source->process(app, source);
 		}
@@ -1113,9 +1114,7 @@ bool iron_internal_handle_messages(void) {
 		activityJustResized = false;
 		int32_t width = iron_android_width();
 		int32_t height = iron_android_height();
-#ifdef IRON_VULKAN
 		iron_gpu_internal_resize(width, height);
-#endif
 		iron_internal_call_resize_callback(width, height);
 	}
 

base/sources/backends/data/android/app/build.gradle.kts

@@ -42,7 +42,7 @@ android {
     externalNativeBuild {
         cmake {
             path = file("CMakeLists.txt")
-            version = "3.22.1"
+            version = "4.0.2"
         }
     }
     buildFeatures {

base/sources/backends/data/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Aug 04 18:00:20 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists