Skip to content

Update Asset directory functionality to recursively search the directory and call apk.addFileInput for each file #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silbinarywolf merged 1 commit into from
Feb 2, 2026
+26 −3
Merged

Update Asset directory functionality to recursively search the directory and call apk.addFileInput for each file #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/androidbuild/apk.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,33 @@ fn doInstallApk(apk: *Apk) std.mem.Allocator.Error!*Step.InstallFile {
// Add assets
for (apk.assets.items) |asset| {
switch (asset) {
.directory => |asset_dir| {
.directory => |asset_dir_path| {
aapt2link.addArg("-A");
aapt2link.addDirectoryArg(asset_dir.source);
},
aapt2link.addDirectoryArg(asset_dir_path.source);

const cwd = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) std.fs.cwd() else std.Io.Dir.cwd();

var asset_dir = (
if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
cwd.openDir(asset_dir_path.source.cwd_relative, .{ .iterate = true })
else
cwd.openDir(b.graph.io, asset_dir_path.source.cwd_relative, .{ .iterate = true })
) catch |err| @panic(@errorName(err));

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

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

while ((
if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
walker.next()
else
walker.next(b.graph.io)
) catch |err| @panic(@errorName(err))) |entry| {
if (entry.kind == .file) aapt2link.addFileInput(try asset_dir_path.source.join(b.allocator, entry.path));
}
}
}
}

Expand Down