Skip to content

restore getPath4 usage from PR #64 and #65 #70

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 4, 2026
Merged

restore getPath4 usage from PR #64 and #65 #70

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/androidbuild/DirectoryFileInput.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ fn make(step: *Step, _: Build.Step.MakeOptions) !void {
const self: *DirectoryFileInput = @fieldParentPtr("step", step);

const run = self.run;
const dir_path = self.dir.getPath3(b, step);
const dir_path = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
self.dir.getPath3(b, step)
else
try self.dir.getPath4(b, step);

// NOTE(jae): 2025-07-23
// As of Zig 0.15.0-dev.1092+d772c0627, package_name_path.openDir("") is not possible as it assumes you're appending a sub-path
Expand Down
5 changes: 4 additions & 1 deletion src/androidbuild/builtin_options_update.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ fn make(step: *Step, _: Build.Step.MakeOptions) !void {
const builtin_options_update: *BuiltinOptionsUpdate = @fieldParentPtr("step", step);
const options = builtin_options_update.options;

const package_name_path = builtin_options_update.package_name_stdout.getPath3(b, step);
const package_name_path = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
builtin_options_update.package_name_stdout.getPath3(b, step)
else
try builtin_options_update.package_name_stdout.getPath4(b, step);

// Read package name from stdout and strip line feed / carriage return
// ie. "com.zig.sdl2\n\r"
Expand Down
5 changes: 4 additions & 1 deletion src/androidbuild/d8glob.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ fn make(step: *Step, _: Build.Step.MakeOptions) !void {
const glob: *@This() = @fieldParentPtr("step", step);
const d8 = glob.run;

const search_dir = glob.dir.getPath3(b, step);
const search_dir = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15)
glob.dir.getPath3(b, step)
else
try glob.dir.getPath4(b, step);

// NOTE(jae): 2024-09-22
// Change current working directory to where the Java classes are
Expand Down