Skip to content

Commit 906073f

Browse files
committed
fix zig 0.16.x compat 2
1 parent 0baa556 commit 906073f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/androidbuild/apk.zig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const std = @import("std");
2+
const builtin = @import("builtin");
23
const androidbuild = @import("androidbuild.zig");
34
const Sdk = @import("tools.zig");
45
const BuiltinOptionsUpdate = @import("builtin_options_update.zig");
@@ -394,7 +395,11 @@ fn doInstallApk(apk: *Apk) std.mem.Allocator.Error!*Step.InstallFile {
394395
});
395396
aapt2packagename.setName(runNameContext("aapt2 dump packagename"));
396397
aapt2packagename.addFileArg(resources_apk);
397-
break :blk aapt2packagename.captureStdOut();
398+
const aapt2_package_name_file = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
399+
aapt2packagename.captureStdOut()
400+
else
401+
keytool.captureStdOut(.{});
402+
break :blk aapt2_package_name_file;
398403
};
399404

400405
const android_builtin = blk: {

0 commit comments

Comments
 (0)