ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle android flags to be more "optional"

Browse Source
This commit is contained in:
gingerBill
2025-03-27 09:53:44 +00:00
parent e9fd565cfd
commit caac504b88
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/package_command.cpp
+12 -6
View File
@@ -124,7 +124,9 @@ i32 package_android(String init_directory) {
cmd = gb_string_append_length(cmd, android_sdk_build_tools.text, android_sdk_build_tools.len); cmd = gb_string_append_length(cmd, android_sdk_build_tools.text, android_sdk_build_tools.len);
cmd = gb_string_appendc(cmd, "aapt"); cmd = gb_string_appendc(cmd, "aapt");
cmd = gb_string_appendc(cmd, " package -f"); cmd = gb_string_appendc(cmd, " package -f");
cmd = gb_string_append_fmt(cmd, " -M \"%.*s\"", LIT(build_context.android_manifest)); if (build_context.android_manifest.len != 0) {
cmd = gb_string_append_fmt(cmd, " -M \"%.*s\"", LIT(build_context.android_manifest));
}
cmd = gb_string_append_fmt(cmd, " -I \"%.*sandroid.jar\"", LIT(android_sdk_platforms)); cmd = gb_string_append_fmt(cmd, " -I \"%.*sandroid.jar\"", LIT(android_sdk_platforms));
cmd = gb_string_append_fmt(cmd, " -F \"%.*s.apk-build\"", LIT(output_apk)); cmd = gb_string_append_fmt(cmd, " -F \"%.*s.apk-build\"", LIT(output_apk));
@@ -139,11 +141,15 @@ i32 package_android(String init_directory) {
gb_string_clear(cmd); 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_length(cmd, build_context.ODIN_ANDROID_JAR_SIGNER.text, build_context.ODIN_ANDROID_JAR_SIGNER.len);
cmd = gb_string_append_fmt(cmd, " -storepass android -keystore \"%.*s\" \"%.*s.apk-build\" \"%.*s\"", cmd = gb_string_append_fmt(cmd, " -storepass android");
LIT(build_context.android_keystore), if (build_context.android_keystore.len != 0) {
LIT(output_apk), cmd = gb_string_append_fmt(cmd, " -keystore \"%.*s\"", LIT(build_context.android_keystore));
LIT(build_context.android_keystore_alias) }
); cmd = gb_string_append_fmt(cmd, " \"%.*s.apk-build\"", LIT(output_apk));
if (build_context.android_keystore_alias.len != 0) {
cmd = gb_string_append_fmt(cmd, " \"%.*s\"", LIT(build_context.android_keystore_alias));
}
result = system_exec_command_line_app("android-jarsigner", cmd); result = system_exec_command_line_app("android-jarsigner", cmd);
if (result) { if (result) {
return result; return result;