File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -214,7 +214,7 @@ pub fn installApk(apk: *Apk) void {
214214
215215pub 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 }
You can’t perform that action at this time.
0 commit comments