Skip to content

Commit 44bb4df

Browse files
authored
Fixed a runtime crash caused by invalid path handling when adding assets to apk (#65)
1 parent 3c2051b commit 44bb4df

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

src/androidbuild/apk.zig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,11 @@ fn doInstallApk(apk: *Apk) std.mem.Allocator.Error!*Step.InstallFile {
363363
aapt2link.addArg("-A");
364364
aapt2link.addDirectoryArg(asset_dir_path.source);
365365

366-
const cwd = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) std.fs.cwd() else std.Io.Dir.cwd();
367-
368366
var asset_dir = (
369367
if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
370-
cwd.openDir(asset_dir_path.source.cwd_relative, .{ .iterate = true })
368+
asset_dir_path.source.getPath3(b, null).openDir("", .{ .iterate = true })
371369
else
372-
cwd.openDir(b.graph.io, asset_dir_path.source.cwd_relative, .{ .iterate = true })
370+
(asset_dir_path.source.getPath4(b, null) catch |err| @panic(@errorName(err))).openDir(b.graph.io, "", .{ .iterate = true })
373371
) catch |err| @panic(@errorName(err));
374372

375373
defer if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) asset_dir.close() else asset_dir.close(b.graph.io);

0 commit comments

Comments
 (0)