Skip to content

Commit 3b26fa5

Browse files
committed
Fixed compile errors
1 parent bb06fce commit 3b26fa5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/androidbuild/apk.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ pub fn installApk(apk: *Apk) void {
214214

215215
pub fn addInstallApk(apk: *Apk) *Step.InstallFile {
216216
return apk.doInstallApk() catch |err| switch (err) {
217-
error.OutOfMemory => @panic("OOM"),
217+
error.OutOfMemory => @panic("OOM")
218218
};
219219
}
220220

@@ -363,15 +363,15 @@ fn doInstallApk(apk: *Apk) std.mem.Allocator.Error!*Step.InstallFile {
363363
aapt2link.addArg("-A");
364364
aapt2link.addDirectoryArg(asset_dir_path.source);
365365

366-
var asset_dir = try std.fs.cwd().openDir(asset_dir_path.source, .{ .iterate = true });
366+
var asset_dir = std.fs.cwd().openDir(asset_dir_path.source.cwd_relative, .{ .iterate = true }) catch |err| @panic(@errorName(err));
367367
defer asset_dir.close();
368368

369369
var walker = try asset_dir.walk(b.allocator);
370370
defer walker.deinit();
371371

372-
while (try walker.next()) |entry| {
372+
while (walker.next() catch |err| @panic(@errorName(err))) |entry| {
373373
if (entry.kind == .file) {
374-
aapt2link.addFileInput(std.fs.path.join(b.allocator, &.{ asset_dir_path, entry.path }));
374+
aapt2link.addFileInput(try asset_dir_path.source.join(b.allocator, entry.path));
375375
}
376376
}
377377
}

0 commit comments

Comments
 (0)