File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change 11const std = @import ("std" );
2+ const builtin = @import ("builtin" );
23const androidbuild = @import ("androidbuild.zig" );
34const Sdk = @import ("tools.zig" );
45const 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 : {
You can’t perform that action at this time.
0 commit comments