Fix build for zig 0.14.0

Author: mrexodia

Sdk.zig

@@ -11,7 +11,12 @@ const auto_detect = @import("build/auto-detect.zig");
 pub fn toolchainHostTag() []const u8 {
     const os = builtin.os.tag;
     const arch = builtin.cpu.arch;
-    return (comptime if (std.mem.eql(u8, @tagName(os), "macos")) "darwin" else @tagName(os)) ++ "-" ++ @tagName(arch);
+    if (std.mem.eql(u8, @tagName(os), "macos")) {
+        // NOTE: There is no darwin-aarch64 toolchain for Android currently
+        return "darwin-x86_64";
+    } else {
+        return @tagName(os) ++ "-" ++ @tagName(arch);
+    }
 }
 
 /// This file encodes a instance of an Android SDK interface.
@@ -108,8 +113,8 @@ pub fn init(b: *Build, user_config: ?UserConfig, toolchains: ToolchainVersions)
 }
 
 pub const ToolchainVersions = struct {
-    build_tools_version: []const u8 = "33.0.1",
-    ndk_version: []const u8 = "25.1.8937393",
+    build_tools_version: []const u8 = "34.0.0",
+    ndk_version: []const u8 = "27.2.12479018",
 };
 
 pub const AndroidVersion = enum(u16) {
@@ -179,8 +184,7 @@ pub const AppConfig = struct {
     package_name: []const u8,
 
     /// The android version which is embedded in the manifset.
-    /// The default is Android 9, it's more than 4 years old by now and should be widespread enough to be a reasonable default.
-    target_version: AndroidVersion = .android9,
+    target_version: AndroidVersion = .android13,
 
     /// The resource directory that will contain the manifest and other app resources.
     /// This should be a distinct directory per app.
@@ -466,7 +470,7 @@ pub fn createApp(
             \\android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
         else
             \\
-            ;
+        ;
 
         writer.print(
             \\    <application android:debuggable="true" android:hasCode="{[hasCode]}" android:label="@string/app_name" {[theme]s} tools:replace="android:icon,android:theme,android:allowBackup,label" android:icon="@mipmap/icon" >
@@ -877,7 +881,7 @@ pub fn compileAppLibrary(
     exe.bundle_compiler_rt = true;
     exe.export_table = true;
 
-    exe.defineCMacro("ANDROID", null);
+    exe.root_module.addCMacro("ANDROID", "");
 
     exe.linkLibC();
     for (app_config.libraries) |lib| {

build.zig

@@ -9,7 +9,7 @@ pub fn build(b: *std.Build) !void {
     // Default-initialize SDK
     const sdk = Sdk.init(b, null, .{});
     const mode = b.standardOptimizeOption(.{});
-    const android_version = b.option(Sdk.AndroidVersion, "android", "Select the android version, default is 'android5'") orelse .android5;
+    const android_version = b.option(Sdk.AndroidVersion, "android", "Select the android version, default is 'android13'") orelse .android13;
     const aaudio = b.option(bool, "aaudio", "Compile with support for AAudio, default is 'false'") orelse false;
     const opensl = b.option(bool, "opensl", "Compile with support for OpenSL ES, default is 'true'") orelse true;
 

examples/invocationhandler/main.zig

@@ -20,20 +20,20 @@ const ButtonData = struct {
 };
 
 pub fn timerInvoke(data: ?*anyopaque, jni: *android.JNI, method: android.jobject, args: android.jobjectArray) !android.jobject {
-    var btn_data = @ptrCast(*ButtonData, @alignCast(@alignOf(*ButtonData), data));
+    var btn_data: *ButtonData = @ptrCast(@alignCast(data));
     btn_data.count += 1;
     std.log.info("Running invoke!", .{});
     const method_name = try android.JNI.String.init(jni, try jni.callObjectMethod(method, "getName", "()Ljava/lang/String;", .{}));
     defer method_name.deinit(jni);
-    std.log.info("Method {}", .{std.unicode.fmtUtf16le(method_name.slice)});
+    std.log.info("Method {}", .{std.unicode.fmtUtf16Le(method_name.slice)});
 
     const length = try jni.invokeJni(.GetArrayLength, .{args});
     var i: i32 = 0;
     while (i < length) : (i += 1) {
         const object = try jni.invokeJni(.GetObjectArrayElement, .{ args, i });
         const string = try android.JNI.String.init(jni, try jni.callObjectMethod(object, "toString", "()Ljava/lang/String;", .{}));
         defer string.deinit(jni);
-        std.log.info("Arg {}: {}", .{ i, std.unicode.fmtUtf16le(string.slice) });
+        std.log.info("Arg {}: {}", .{ i, std.unicode.fmtUtf16Le(string.slice) });
 
         if (i == 0) {
             const Button = try jni.findClass("android/widget/Button");
@@ -61,10 +61,10 @@ pub const AndroidApp = struct {
 
     // This is needed because to run a callback on the UI thread Looper you must
     // react to a fd change, so we use a pipe to force it
-    pipe: [2]std.os.fd_t = undefined,
+    pipe: [2]std.posix.fd_t = undefined,
     // This is used with futexes so that runOnUiThread waits until the callback is completed
     // before returning.
-    uiThreadCondition: std.atomic.Atomic(u32) = std.atomic.Atomic(u32).init(0),
+    uiThreadCondition: std.atomic.Value(u32) = std.atomic.Value(u32).init(0),
     uiThreadLooper: *android.ALooper = undefined,
     uiThreadId: std.Thread.Id = undefined,
 
@@ -83,10 +83,10 @@ pub const AndroidApp = struct {
         // Initialize the variables we need to execute functions on the UI thread
         self.uiThreadLooper = android.ALooper_forThread().?;
         self.uiThreadId = std.Thread.getCurrentId();
-        self.pipe = try std.os.pipe();
+        self.pipe = try std.posix.pipe();
         android.ALooper_acquire(self.uiThreadLooper);
 
-        var native_activity = android.NativeActivity.init(self.activity);
+        const native_activity = android.NativeActivity.init(self.activity);
         var jni = native_activity.jni;
         self.uiJni = native_activity;
 
@@ -125,7 +125,7 @@ pub const AndroidApp = struct {
 
         const Instance = struct {
             fn callback(_: c_int, _: c_int, data: ?*anyopaque) callconv(.C) c_int {
-                const data_struct = @ptrCast(*Data, @alignCast(@alignOf(Data), data.?));
+                const data_struct: *Data = @ptrCast(@alignCast(data.?));
                 const self_ptr = data_struct.self;
                 defer self_ptr.allocator.destroy(data_struct);
 
@@ -143,7 +143,7 @@ pub const AndroidApp = struct {
             Instance.callback,
             data_ptr,
         );
-        std.debug.assert(try std.os.write(self.pipe[1], "hello") == 5);
+        std.debug.assert(try std.posix.write(self.pipe[1], "hello") == 5);
         if (result == -1) {
             return error.LooperError;
         }
@@ -156,7 +156,7 @@ pub const AndroidApp = struct {
     }
 
     pub fn deinit(self: *AndroidApp) void {
-        @atomicStore(bool, &self.running, false, .SeqCst);
+        @atomicStore(bool, &self.running, false, .seq_cst);
         if (self.thread) |thread| {
             thread.join();
             self.thread = null;

examples/textview/main.zig

@@ -13,7 +13,6 @@ const c = android.egl.c;
 const app_log = std.log.scoped(.app);
 comptime {
     _ = android.ANativeActivity_createFunc;
-    _ = @import("root").log;
 }
 
 pub const AndroidApp = struct {
@@ -29,10 +28,10 @@ pub const AndroidApp = struct {
 
     // This is needed because to run a callback on the UI thread Looper you must
     // react to a fd change, so we use a pipe to force it
-    pipe: [2]std.os.fd_t = undefined,
+    pipe: [2]std.posix.fd_t = undefined,
     // This is used with futexes so that runOnUiThread waits until the callback is completed
     // before returning.
-    uiThreadCondition: std.atomic.Atomic(u32) = std.atomic.Atomic(u32).init(0),
+    uiThreadCondition: std.atomic.Value(u32) = std.atomic.Value(u32).init(0),
     uiThreadLooper: *android.ALooper = undefined,
     uiThreadId: std.Thread.Id = undefined,
 
@@ -49,7 +48,7 @@ pub const AndroidApp = struct {
         // Initialize the variables we need to execute functions on the UI thread
         self.uiThreadLooper = android.ALooper_forThread().?;
         self.uiThreadId = std.Thread.getCurrentId();
-        self.pipe = try std.os.pipe();
+        self.pipe = try std.posix.pipe();
         android.ALooper_acquire(self.uiThreadLooper);
 
         var native_activity = NativeActivity.init(self.activity);
@@ -91,7 +90,7 @@ pub const AndroidApp = struct {
 
         const Instance = struct {
             fn callback(_: c_int, _: c_int, data: ?*anyopaque) callconv(.C) c_int {
-                const data_struct = @ptrCast(*Data, @alignCast(@alignOf(Data), data.?));
+                const data_struct: *Data = @ptrCast(@alignCast(data.?));
                 const self_ptr = data_struct.self;
                 defer self_ptr.allocator.destroy(data_struct);
 
@@ -109,7 +108,7 @@ pub const AndroidApp = struct {
             Instance.callback,
             data_ptr,
         );
-        std.debug.assert(try std.os.write(self.pipe[1], "hello") == 5);
+        std.debug.assert(try std.posix.write(self.pipe[1], "hello") == 5);
         if (result == -1) {
             return error.LooperError;
         }
@@ -122,7 +121,7 @@ pub const AndroidApp = struct {
     }
 
     pub fn deinit(self: *AndroidApp) void {
-        @atomicStore(bool, &self.running, false, .SeqCst);
+        @atomicStore(bool, &self.running, false, .seq_cst);
         if (self.thread) |thread| {
             thread.join();
             self.thread = null;

src/NativeInvocationHandler.zig

@@ -59,7 +59,8 @@ const InvocationHandler = struct {
         const Class = try jni.invokeJni(.GetObjectClass, .{this});
         const ptrField = try jni.invokeJni(.GetFieldID, .{ Class, "ptr", "J" });
         const jptr = try jni.getLongField(this, ptrField);
-        const h = @as(*InvocationHandler, @ptrFromInt(jptr));
+        const uptr: usize = @intCast(jptr);
+        const h = @as(*InvocationHandler, @ptrFromInt(uptr));
         return h.function(h.pointer, jni, method, args);
     }
 };