ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-18 03:42:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve bodge for android execute build

Browse Source
This commit is contained in:
gingerBill
2025-03-26 17:45:04 +00:00
parent 45ecafd7b1
commit eee450516e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linker.cpp
+5 -3
View File
@@ -972,12 +972,14 @@ try_cross_linking:;
TIME_SECTION("Android aapt");
String output_apk = path_remove_extension(output_filename);
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, " package -f");
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, " -F \"%.*s.apk-build\"", LIT(output_filename));
cmd = gb_string_append_fmt(cmd, " -F \"%.*s.apk-build\"", LIT(output_apk));
result = system_exec_command_line_app("android-aapt", cmd);
if (result) {
@@ -990,7 +992,7 @@ try_cross_linking:;
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\"",
LIT(build_context.android_keystore),
LIT(output_filename),
LIT(output_apk),
LIT(build_context.android_keystore_alias)
);
result = system_exec_command_line_app("android-jarsigner", cmd);
@@ -1004,7 +1006,7 @@ try_cross_linking:;
cmd = gb_string_append_length(cmd, android_sdk_build_tools.text, android_sdk_build_tools.len);
cmd = gb_string_appendc(cmd, "zipalign");
cmd = gb_string_appendc(cmd, " -f 4");
cmd = gb_string_append_fmt(cmd, " \"%.*s.apk-build\" \"%.*s.apk\"", LIT(output_filename), LIT(output_filename));
cmd = gb_string_append_fmt(cmd, " \"%.*s.apk-build\" \"%.*s.apk\"", LIT(output_apk), LIT(output_apk));
result = system_exec_command_line_app("android-zipalign", cmd);