update various code sites to handle Zig 0.16.x

.github/workflows/ci.yml

@@ -138,6 +138,9 @@ jobs:
       run: zig build -Dandroid=true --verbose
       working-directory: examples/sdl2
 
-    - name: Build Raylib Example (Zig Stable)
-      run: zig build -Dandroid=true --verbose
-      working-directory: examples/raylib
+    # note(jae): 2026-01-10
+    # Downstream packages for Raylib won't work with Zig 0.15.2 *and* Zig 0.16.X
+    #
+    # - name: Build Raylib Example (Zig Nightly)
+    #  run: zig build -Dandroid=true --verbose
+    #  working-directory: examples/raylib

build.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const androidbuild = @import("src/androidbuild/androidbuild.zig");
 
 // Expose Android build functionality for use in your build.zig
@@ -27,17 +28,56 @@ pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const module = b.addModule("android", .{
+    // Create stub of builtin options.
+    // This is discovered and then replaced by "Apk" in the build process
+    const android_builtin_options = std.Build.addOptions(b);
+    android_builtin_options.addOption([:0]const u8, "package_name", "");
+    const android_builtin_module = android_builtin_options.createModule();
+
+    // Create android module
+    const android_module = b.addModule("android", .{
         .root_source_file = b.path("src/android/android.zig"),
         .target = target,
         .optimize = optimize,
     });
+    const ndk_module = b.createModule(.{
+        .root_source_file = b.path("src/android/ndk/ndk.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+    android_module.addImport("ndk", ndk_module);
+    android_module.addImport("android_builtin", android_builtin_module);
 
-    // Create stub of builtin options.
-    // This is discovered and then replaced by "Apk" in the build process
-    const android_builtin_options = std.Build.addOptions(b);
-    android_builtin_options.addOption([:0]const u8, "package_name", "");
-    module.addImport("android_builtin", android_builtin_options.createModule());
+    // Add backwards compatibility modules
+    if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 14) {
+        // Deprecated: Allow older Zig builds to work
+        var zig014 = b.createModule(.{
+            .root_source_file = b.path("src/android/zig014/zig014.zig"),
+            .target = target,
+            .optimize = optimize,
+        });
+        zig014.addImport("ndk", ndk_module);
+        zig014.addImport("android_builtin", android_builtin_module);
+        android_module.addImport("zig014", zig014);
+    }
+    if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) {
+        // Add as a module to deal with @Type(.enum_literal) being deprecated
+        const zig015 = b.createModule(.{
+            .root_source_file = b.path("src/android/zig015/zig015.zig"),
+            .target = target,
+            .optimize = optimize,
+        });
+        android_module.addImport("zig015", zig015);
+    }
+    if (builtin.zig_version.major == 0 and builtin.zig_version.minor >= 16) {
+        // Add as a module to deal with @Type(.enum_literal) being deprecated
+        const zig016 = b.createModule(.{
+            .root_source_file = b.path("src/android/zig016/zig016.zig"),
+            .target = target,
+            .optimize = optimize,
+        });
+        android_module.addImport("zig016", zig016);
+    }
 
-    module.linkSystemLibrary("log", .{});
+    android_module.linkSystemLibrary("log", .{});
 }

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .android,
-    .version = "0.2.0",
+    .version = "0.3.0",
     .dependencies = .{},
     .paths = .{
         "build.zig",

examples/minimal/src/minimal.zig

@@ -12,8 +12,8 @@ pub const std_options: std.Options = if (builtin.abi.isAndroid())
 else
     .{};
 
-/// custom panic handler for Android
-pub const panic = if (builtin.abi.isAndroid())
+/// Deprecated: Zig 0.15.2 and lower only, Custom panic handler for Android
+pub const panic = if (builtin.abi.isAndroid() and builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
     android.panic
 else
     std.debug.FullPanic(std.debug.defaultPanic);

examples/raylib/src/main.zig

@@ -3,7 +3,7 @@ const builtin = @import("builtin");
 const android = @import("android");
 const rl = @import("raylib");
 
-pub fn main() void {
+pub fn main() !void {
     const screenWidth = 800;
     const screenHeight = 450;
     rl.initWindow(screenWidth, screenHeight, "raylib-zig [core] example - basic window");
@@ -19,8 +19,8 @@ pub fn main() void {
     }
 }
 
-/// custom panic handler for Android
-pub const panic = if (builtin.abi.isAndroid())
+/// Deprecated: Zig 0.15.2 and lower only, Custom panic handler for Android
+pub const panic = if (builtin.abi.isAndroid() and builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
     android.panic
 else
     std.debug.FullPanic(std.debug.defaultPanic);

examples/sdl2/build.zig

@@ -21,8 +21,8 @@ pub fn build(b: *std.Build) void {
         const android_sdk = android.Sdk.create(b, .{});
         const apk = android_sdk.createApk(.{
             .api_level = .android15,
-            .build_tools_version = "35.0.1",
-            .ndk_version = "29.0.13113456",
+            .build_tools_version = "36.1.0",
+            .ndk_version = "29.0.14206865",
             // NOTE(jae): 2025-03-09
             // Previously this example used 'ndk' "27.0.12077973".
             //
@@ -70,14 +70,6 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
             .root_source_file = b.path("src/sdl-zig-demo.zig"),
         });
-        var exe: *std.Build.Step.Compile = if (target.result.abi.isAndroid()) b.addLibrary(.{
-            .name = exe_name,
-            .root_module = app_module,
-            .linkage = .dynamic,
-        }) else b.addExecutable(.{
-            .name = exe_name,
-            .root_module = app_module,
-        });
 
         const library_optimize = if (!target.result.abi.isAndroid())
             optimize
@@ -96,15 +88,15 @@ pub fn build(b: *std.Build) void {
             if (target.result.os.tag == .linux and !target.result.abi.isAndroid()) {
                 // The SDL package doesn't work for Linux yet, so we rely on system
                 // packages for now.
-                exe.linkSystemLibrary("SDL2");
-                exe.linkLibC();
+                app_module.linkSystemLibrary("SDL2", .{});
+                app_module.link_libc = true;
             } else {
                 const sdl_lib = sdl_dep.artifact("SDL2");
-                exe.linkLibrary(sdl_lib);
+                app_module.linkLibrary(sdl_lib);
             }
 
             const sdl_module = sdl_dep.module("sdl");
-            exe.root_module.addImport("sdl", sdl_module);
+            app_module.addImport("sdl", sdl_module);
         }
 
         // if building as library for Android, add this target
@@ -116,10 +108,19 @@ pub fn build(b: *std.Build) void {
                 .optimize = optimize,
                 .target = target,
             });
-            exe.root_module.addImport("android", android_dep.module("android"));
+            app_module.addImport("android", android_dep.module("android"));
 
-            apk.addArtifact(exe);
+            const exe_lib = b.addLibrary(.{
+                .name = exe_name,
+                .root_module = app_module,
+                .linkage = .dynamic,
+            });
+            apk.addArtifact(exe_lib);
         } else {
+            const exe = b.addExecutable(.{
+                .name = exe_name,
+                .root_module = app_module,
+            });
             b.installArtifact(exe);
 
             // If only 1 target, add "run" step

examples/sdl2/src/sdl-zig-demo.zig

@@ -6,16 +6,16 @@ const sdl = @import("sdl");
 const log = std.log;
 const assert = std.debug.assert;
 
-/// custom standard options for Android
+// custom standard options for Android
 pub const std_options: std.Options = if (builtin.abi.isAndroid())
     .{
         .logFn = android.logFn,
     }
 else
     .{};
 
-/// custom panic handler for Android
-pub const panic = if (builtin.abi.isAndroid())
+/// Deprecated: Zig 0.15.2 and lower only, Custom panic handler for Android
+pub const panic = if (builtin.abi.isAndroid() and builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
     android.panic
 else
     std.debug.FullPanic(std.debug.defaultPanic);
@@ -29,7 +29,20 @@ comptime {
 /// This needs to be exported for Android builds
 fn SDL_main() callconv(.c) void {
     if (comptime builtin.abi.isAndroid()) {
-        _ = std.start.callMain();
+        if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 14) {
+            _ = std.start.callMain();
+        } else if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) {
+            main() catch |err| {
+                log.err("{s}", .{@errorName(err)});
+                if (@errorReturnTrace()) |trace| {
+                    if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) {
+                        std.debug.dumpStackTrace(trace.*);
+                    } else {
+                        std.debug.dumpStackTrace(trace);
+                    }
+                }
+            };
+        }
     } else {
         @compileError("SDL_main should not be called outside of Android builds");
     }