start work on updating to Zig 0.14.0

silbinarywolf · silbinarywolf · commit e113b1389b08 · 2025-03-08T12:51:10.000+11:00
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ Add the following to your build.zig.zon file and run `zig build`.
 ```zig
 .{
     .dependencies = .{
-        .@"zig-android-sdk" = .{
+        .android = .{
             .path = "https://github.com/silbinarywolf/zig-android-sdk/archive/REPLACE_WITH_WANTED_COMMIT.tar.gz",
             // .hash = REPLACE_WITH_HASH_FROM_BUILD_ERROR
         },
diff --git a/build.zig.zon b/build.zig.zon
@@ -1,10 +1,11 @@
 .{
-    .name = "zig-android-sdk",
+    .name = .android,
     .version = "0.1.0",
     .dependencies = .{},
     .paths = .{
         "build.zig",
         "build.zig.zon",
         "src",
     },
+    .fingerprint = 0x92bcb62d42fb2cee,
 }
diff --git a/examples/minimal/build.zig b/examples/minimal/build.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const android = @import("zig-android-sdk");
+const android = @import("android");
 
 pub fn build(b: *std.Build) void {
     const exe_name: []const u8 = "minimal";
@@ -37,7 +37,7 @@ pub fn build(b: *std.Build) void {
     };
 
     for (targets) |target| {
-        var exe: *std.Build.Step.Compile = if (target.result.isAndroid()) b.addSharedLibrary(.{
+        var exe: *std.Build.Step.Compile = if (target.result.abi.isAndroid()) b.addSharedLibrary(.{
             .name = exe_name,
             .root_source_file = b.path("src/minimal.zig"),
             .target = target,
@@ -52,9 +52,9 @@ pub fn build(b: *std.Build) void {
         // if building as library for Android, add this target
         // NOTE: Android has different CPU targets so you need to build a version of your
         //       code for x86, x86_64, arm, arm64 and more
-        if (target.result.isAndroid()) {
+        if (target.result.abi.isAndroid()) {
             const apk: *android.APK = android_apk orelse @panic("Android APK should be initialized");
-            const android_dep = b.dependency("zig-android-sdk", .{
+            const android_dep = b.dependency("android", .{
                 .optimize = optimize,
                 .target = target,
             });
diff --git a/examples/minimal/build.zig.zon b/examples/minimal/build.zig.zon
@@ -1,8 +1,8 @@
 .{
-    .name = "minimal",
+    .name = .minimal,
     .version = "0.0.0",
     .dependencies = .{
-        .@"zig-android-sdk" = .{
+        .android = .{
             .path = "../..",
         },
     },
@@ -11,4 +11,5 @@
         "build.zig.zon",
         "src",
     },
+    .fingerprint = 0x4037f28ad1eb4832,
 }
diff --git a/examples/sdl2/android/src/ZigSDLActivity.java b/examples/sdl2/android/src/ZigSDLActivity.java
@@ -9,7 +9,6 @@ public class ZigSDLActivity extends SDLActivity {
     // @Override
     // protected String[] getLibraries() {
     //     return new String[] {
-    //         "hidapi",
     //         "SDL2",
     //         // "SDL2_image",
     //         // "SDL2_mixer",
diff --git a/examples/sdl2/build.zig b/examples/sdl2/build.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const android = @import("zig-android-sdk");
+const android = @import("android");
 
 pub fn build(b: *std.Build) void {
     const root_target = b.standardTargetOptions(.{});
@@ -47,7 +47,7 @@ pub fn build(b: *std.Build) void {
 
     for (targets) |target| {
         const exe_name: []const u8 = "sdl-zig-demo";
-        var exe: *std.Build.Step.Compile = if (target.result.isAndroid()) b.addSharedLibrary(.{
+        var exe: *std.Build.Step.Compile = if (target.result.abi.isAndroid()) b.addSharedLibrary(.{
             .name = exe_name,
             .root_source_file = b.path("src/sdl-zig-demo.zig"),
             .target = target,
@@ -65,7 +65,7 @@ pub fn build(b: *std.Build) void {
                 .optimize = .ReleaseFast,
                 .target = target,
             });
-            if (target.result.os.tag == .linux and !target.result.isAndroid()) {
+            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");
@@ -75,22 +75,16 @@ pub fn build(b: *std.Build) void {
                 exe.linkLibrary(sdl_lib);
             }
 
-            // NOTE(jae): 2024-09-22
-            // Load additional dynamic libraries that SDLActivity.java loads such as hidapi
-            if (target.result.isAndroid()) {
-                exe.linkLibrary(sdl_dep.artifact("hidapi"));
-            }
-
             const sdl_module = sdl_dep.module("sdl");
             exe.root_module.addImport("sdl", sdl_module);
         }
 
         // if building as library for Android, add this target
         // NOTE: Android has different CPU targets so you need to build a version of your
         //       code for x86, x86_64, arm, arm64 and more
-        if (target.result.isAndroid()) {
+        if (target.result.abi.isAndroid()) {
             const apk: *android.APK = android_apk orelse @panic("Android APK should be initialized");
-            const android_dep = b.dependency("zig-android-sdk", .{
+            const android_dep = b.dependency("android", .{
                 .optimize = optimize,
                 .target = target,
             });
diff --git a/examples/sdl2/build.zig.zon b/examples/sdl2/build.zig.zon
@@ -1,8 +1,8 @@
 .{
-    .name = "minimal",
+    .name = .sdl2,
     .version = "0.0.0",
     .dependencies = .{
-        .@"zig-android-sdk" = .{
+        .android = .{
             .path = "../..",
         },
         .sdl2 = .{
@@ -14,4 +14,5 @@
         "build.zig.zon",
         "src",
     },
+    .fingerprint = 0x168fc6b9a7d0df48,
 }
diff --git a/examples/sdl2/third-party/sdl2/build.zig b/examples/sdl2/third-party/sdl2/build.zig
@@ -72,89 +72,78 @@ pub fn build(b: *std.Build) !void {
             lib.linkFramework("CoreHaptics");
         },
         else => {
-            switch (target.result.abi) {
-                .android => {
+            if (target.result.abi.isAndroid()) {
+                lib.root_module.addCSourceFiles(.{
+                    .root = sdl_path,
+                    .files = &android_src_files,
+                });
+
+                // This is needed for "src/render/opengles/SDL_render_gles.c" to compile
+                lib.root_module.addCMacro("GL_GLEXT_PROTOTYPES", "1");
+
+                // Add Java files to dependency
+                const java_dir = sdl_dep.path("android-project/app/src/main/java/org/libsdl/app");
+                const java_files: []const []const u8 = &.{
+                    "SDL.java",
+                    "SDLSurface.java",
+                    "SDLActivity.java",
+                    "SDLAudioManager.java",
+                    "SDLControllerManager.java",
+                    "HIDDevice.java",
+                    "HIDDeviceUSB.java",
+                    "HIDDeviceManager.java",
+                    "HIDDeviceBLESteamController.java",
+                };
+                const java_write_files = b.addNamedWriteFiles("sdljava");
+                for (java_files) |java_file_basename| {
+                    _ = java_write_files.addCopyFile(java_dir.path(b, java_file_basename), java_file_basename);
+                }
+
+                // https://github.com/libsdl-org/SDL/blob/release-2.30.6/Android.mk#L82C62-L82C69
+                lib.linkSystemLibrary("dl");
+                lib.linkSystemLibrary("GLESv1_CM");
+                lib.linkSystemLibrary("GLESv2");
+                lib.linkSystemLibrary("OpenSLES");
+                lib.linkSystemLibrary("log");
+                lib.linkSystemLibrary("android");
+
+                // SDLActivity.java's getMainFunction defines the entrypoint as "SDL_main"
+                // So your main / root file will need something like this for Android
+                //
+                // fn android_sdl_main() callconv(.C) void {
+                //    _ = std.start.callMain();
+                // }
+                // comptime {
+                //    if (builtin.abi == .android) @export(android_sdl_main, .{ .name = "SDL_main", .linkage = .strong });
+                // }
+
+                // TODO(jae): 2025-03-08
+                // Need to investigate why hidapi is failing as of Zig 0.14.0
+                const use_hidapi = false;
+                if (!use_hidapi) {
+                    lib.root_module.addCMacro("SDL_HIDAPI_DISABLED", "");
+                } else {
+                    // NOTE(jae): 2024-09-22
+                    // Build settings taken from: src/hidapi/android/jni/Android.mk
+                    // SDLActivity.java by default expects to be able to load this library
                     lib.root_module.addCSourceFiles(.{
                         .root = sdl_path,
-                        .files = &android_src_files,
+                        .files = &[_][]const u8{
+                            "src/hidapi/android/hid.cpp",
+                        },
+                        .flags = &.{"-std=c++11"},
                     });
-
-                    // This is needed for "src/render/opengles/SDL_render_gles.c" to compile
-                    lib.root_module.addCMacro("GL_GLEXT_PROTOTYPES", "1");
-
-                    // Add Java files to dependency
-                    const java_dir = sdl_dep.path("android-project/app/src/main/java/org/libsdl/app");
-                    const java_files: []const []const u8 = &.{
-                        "SDL.java",
-                        "SDLSurface.java",
-                        "SDLActivity.java",
-                        "SDLAudioManager.java",
-                        "SDLControllerManager.java",
-                        "HIDDevice.java",
-                        "HIDDeviceUSB.java",
-                        "HIDDeviceManager.java",
-                        "HIDDeviceBLESteamController.java",
-                    };
-                    const java_write_files = b.addNamedWriteFiles("sdljava");
-                    for (java_files) |java_file_basename| {
-                        _ = java_write_files.addCopyFile(java_dir.path(b, java_file_basename), java_file_basename);
-                    }
-
-                    // https://github.com/libsdl-org/SDL/blob/release-2.30.6/Android.mk#L82C62-L82C69
-                    lib.linkSystemLibrary("dl");
-                    lib.linkSystemLibrary("GLESv1_CM");
-                    lib.linkSystemLibrary("GLESv2");
-                    lib.linkSystemLibrary("OpenSLES");
-                    lib.linkSystemLibrary("log");
-                    lib.linkSystemLibrary("android");
-
-                    // SDLActivity.java's getMainFunction defines the entrypoint as "SDL_main"
-                    // So your main / root file will need something like this for Android
-                    //
-                    // fn android_sdl_main() callconv(.C) void {
-                    //    _ = std.start.callMain();
-                    // }
-                    // comptime {
-                    //    if (builtin.abi == .android) @export(android_sdl_main, .{ .name = "SDL_main", .linkage = .strong });
-                    // }
-
-                    const use_hidapi = true;
-                    if (!use_hidapi) {
-                        lib.root_module.addCMacro("SDL_HIDAPI_DISABLED", "");
-                    } else {
-                        // NOTE(jae): 2024-09-22
-                        // Build settings taken from: src/hidapi/android/jni/Android.mk
-                        // SDLActivity.java by default expects to be able to load this library.
-                        const hidapi_lib = b.addSharedLibrary(.{
-                            .name = "hidapi",
-                            .target = target,
-                            .optimize = optimize,
-                            .link_libc = true,
-                        });
-                        hidapi_lib.addIncludePath(sdl_include_path);
-                        hidapi_lib.root_module.addCSourceFiles(.{
-                            .root = sdl_path,
-                            .files = &[_][]const u8{
-                                "src/hidapi/android/hid.cpp",
-                            },
-                            .flags = &.{"-std=c++11"},
-                        });
-                        hidapi_lib.linkSystemLibrary("log");
-                        hidapi_lib.linkLibCpp();
-                        lib.linkLibrary(hidapi_lib);
-                        b.installArtifact(hidapi_lib);
-                    }
-                },
-                else => {
-                    const config_header = b.addConfigHeader(.{
-                        .style = .{ .cmake = sdl_include_path.path(b, "SDL_config.h.cmake") },
-                        .include_path = "SDL/SDL_config.h",
-                    }, .{});
-                    sdl_config_header = config_header;
-
-                    lib.addConfigHeader(config_header);
-                    lib.installConfigHeader(config_header);
-                },
+                    lib.linkLibCpp();
+                }
+            } else {
+                const config_header = b.addConfigHeader(.{
+                    .style = .{ .cmake = sdl_include_path.path(b, "SDL_config.h.cmake") },
+                    .include_path = "SDL/SDL_config.h",
+                }, .{});
+                sdl_config_header = config_header;
+
+                lib.addConfigHeader(config_header);
+                lib.installConfigHeader(config_header);
             }
         },
     }
@@ -167,6 +156,8 @@ pub fn build(b: *std.Build) !void {
     b.installArtifact(lib);
 
     var module = b.addModule("sdl", .{
+        .target = b.graph.host,
+        .optimize = .ReleaseFast,
         .root_source_file = b.path("src/sdl.zig"),
     });
     if (sdl_config_header) |config_header| {
diff --git a/examples/sdl2/third-party/sdl2/build.zig.zon b/examples/sdl2/third-party/sdl2/build.zig.zon
@@ -5,8 +5,8 @@
         .sdl2 = .{
             // NOTE(jae): 2024-06-30
             // Using ".zip" as "tar.gz" fails on Windows for Zig 0.13.0 due to symlink issue with something in the android folders
-            .url = "https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.30.4.zip",
-            .hash = "122086865a4d5e822c068528a4170cb7da52afad38e8232afa3e74789c4d52d27791",
+            .url = "https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.32.2.zip",
+            .hash = "12204a4a9e9f41fc906decd762be78b9e80de65a7bdec428aa0dfdf03f46e7614d9e",
         },
     },
     .paths = .{
diff --git a/src/android/android.zig b/src/android/android.zig
@@ -306,7 +306,7 @@ pub const Panic = struct {
 
     fn dumpStackTrace(stack_trace: std.builtin.StackTrace) void {
         nosuspend {
-            if (comptime builtin.target.isWasm()) {
+            if (comptime builtin.target.cpu.arch.isWasm()) {
                 if (native_os == .wasi) {
                     const stderr = io.getStdErr().writer();
                     stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;
@@ -341,7 +341,7 @@ pub const Panic = struct {
     const writeCurrentStackTrace = std.debug.writeCurrentStackTrace;
     fn dumpCurrentStackTrace(start_addr: ?usize) void {
         nosuspend {
-            if (comptime builtin.target.isWasm()) {
+            if (comptime builtin.target.cpu.arch.isWasm()) {
                 if (native_os == .wasi) {
                     const stderr = io.getStdErr().writer();
                     stderr.print("Unable to dump stack trace: not implemented for Wasm\n", .{}) catch return;
diff --git a/src/androidbuild/androidbuild.zig b/src/androidbuild/androidbuild.zig
@@ -45,7 +45,7 @@ pub const KeyStore = struct {
 };
 
 pub fn getAndroidTriple(target: ResolvedTarget) error{InvalidAndroidTarget}![]const u8 {
-    if (target.result.abi != .android) return error.InvalidAndroidTarget;
+    if (!target.result.abi.isAndroid()) return error.InvalidAndroidTarget;
     return switch (target.result.cpu.arch) {
         .x86 => "i686-linux-android",
         .x86_64 => "x86_64-linux-android",
@@ -66,7 +66,7 @@ pub fn standardTargets(b: *std.Build, target: ResolvedTarget) []ResolvedTarget {
     if (all_targets) {
         return getAllAndroidTargets(b);
     }
-    if (target.result.abi != .android) {
+    if (!target.result.abi.isAndroid()) {
         return &[0]ResolvedTarget{};
     }
     if (target.result.os.tag != .linux) {
@@ -130,7 +130,7 @@ const AndroidTargetQuery = struct {
         return .{
             .os_tag = .linux,
             .cpu_model = .baseline,
-            .abi = .android,
+            .abi = if (android_target.cpu_arch != .arm) .android else .androideabi,
             .cpu_arch = android_target.cpu_arch,
             .cpu_features_add = android_target.cpu_features_add,
         };
@@ -154,6 +154,9 @@ const supported_android_targets = [_]AndroidTargetQuery{
     // TODO(jae): 2024-09-08
     // This doesn't work for compiling C code like SDL2 or OpenXR due to "__ARM_ARCH" not being "7"
     // or similar. I might be messing something up here but not sure.
+    //
+    // TODO(jae): 2025-03-08
+    // Look into fixing: src/cpuinfo/SDL_cpuinfo.c:93:10: error: 'cpu-features.h' file not found
     // .{
     //     // arm-linux-androideabi
     //     .cpu_arch = .arm,
diff --git a/src/androidbuild/apk.zig b/src/androidbuild/apk.zig
