diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2025-04-04 12:05:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-04 12:05:21 +0100 |
| commit | 19e056a80619f91fad04ce73950ed122c2a11881 (patch) | |
| tree | 87ec70d6249904aec38aca15945f1b482afa0b79 /src/bundle_command.cpp | |
| parent | d9f990d42e2a1bccf3e7be8ba02efa6504e9af9b (diff) | |
| parent | 4495f0f0f245e4534aa39e153176b42b4d2db8f6 (diff) | |
Merge pull request #4997 from IllusionMan1212/android-fixes
A few fixes for android
Diffstat (limited to 'src/bundle_command.cpp')
| -rw-r--r-- | src/bundle_command.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bundle_command.cpp b/src/bundle_command.cpp index b3bca2b51..11ff4e6e1 100644 --- a/src/bundle_command.cpp +++ b/src/bundle_command.cpp @@ -132,7 +132,7 @@ i32 bundle_android(String original_init_directory) { if (current_directory.len != 0) { bool ok = set_working_directory(init_directory); if (!ok) { - gb_printf_err("Error: Unable to currectly set the current working directory to '%.*s'\n", LIT(init_directory)); + gb_printf_err("Error: Unable to correctly set the current working directory to '%.*s'\n", LIT(init_directory)); } } @@ -172,9 +172,10 @@ i32 bundle_android(String original_init_directory) { gb_string_clear(cmd); cmd = gb_string_append_length(cmd, build_context.ODIN_ANDROID_JAR_SIGNER.text, build_context.ODIN_ANDROID_JAR_SIGNER.len); - cmd = gb_string_append_fmt(cmd, " -storepass android"); + cmd = gb_string_append_fmt(cmd, " -storepass \"%.*s\"", LIT(build_context.android_keystore_password)); if (build_context.android_keystore.len != 0) { - String keystore = concatenate_strings(temporary_allocator(), current_directory, build_context.android_keystore); + String keystore = normalize_path(temporary_allocator(), build_context.android_keystore, NIX_SEPARATOR_STRING); + keystore = substring(keystore, 0, keystore.len - 1); cmd = gb_string_append_fmt(cmd, " -keystore \"%.*s\"", LIT(keystore)); } cmd = gb_string_append_fmt(cmd, " \"%.*s.apk-build\"", LIT(output_apk)); |