Skip to content

Commit

Permalink
Fix log tags
Browse files Browse the repository at this point in the history
  • Loading branch information
Mahmud0808 committed Sep 26, 2023
1 parent 5cbc48c commit 69f8be9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public static boolean runAapt(String source, String name) {
result = Shell.cmd(aapt + " p -f -M " + source + "/AndroidManifest.xml -I /system/framework/framework-res.apk -S " + source + "/res -F " + Resources.UNSIGNED_UNALIGNED_DIR + '/' + name + "-unsigned-unaligned.apk >/dev/null;").exec();

if (result.isSuccess()) {
Log.i(TAG + " - AAPT2", "Successfully built APK for " + name);
Log.i(TAG + " - AAPT", "Successfully built APK for " + name);
break;
} else {
Log.e(TAG + " - AAPT2", "Failed to build APK for " + name + '\n' + String.join("\n", result.getOut()));
Log.e(TAG + " - AAPT", "Failed to build APK for " + name + '\n' + String.join("\n", result.getOut()));
try {
Thread.sleep(2000);
} catch (Exception ignored) {
Expand All @@ -80,7 +80,7 @@ public static boolean runAapt(String source, String name) {
}

if (!result.isSuccess())
writeLog(TAG + " - AAPT2", "Failed to build APK for " + name, result.getOut());
writeLog(TAG + " - AAPT", "Failed to build APK for " + name, result.getOut());

return !result.isSuccess();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public static boolean runAapt(String source) {
Shell.Result result = Shell.cmd(aapt + " p -f -M " + source + "/AndroidManifest.xml -I /system/framework/framework-res.apk -S " + source + "/res -F " + Resources.UNSIGNED_UNALIGNED_DIR + '/' + name + "-unsigned-unaligned.apk").exec();

if (result.isSuccess()) {
Log.i(TAG + " - AAPT2", "Successfully built APK for " + name);
Log.i(TAG + " - AAPT", "Successfully built APK for " + name);
} else {
Log.e(TAG + " - AAPT2", "Failed to build APK for " + name + '\n' + String.join("\n", result.getOut()));
writeLog(TAG + " - AAPT2", "Failed to build APK for " + name, result.getOut());
Log.e(TAG + " - AAPT", "Failed to build APK for " + name + '\n' + String.join("\n", result.getOut()));
writeLog(TAG + " - AAPT", "Failed to build APK for " + name, result.getOut());
}

return !result.isSuccess();
Expand All @@ -52,10 +52,10 @@ public static boolean runAapt(String source, String[] splitLocations) {

Shell.Result result = Shell.cmd(String.valueOf(aaptCommand)).exec();

if (result.isSuccess()) Log.i(TAG + " - AAPT2", "Successfully built APK for " + name);
if (result.isSuccess()) Log.i(TAG + " - AAPT", "Successfully built APK for " + name);
else {
Log.e(TAG + " - AAPT2", "Failed to build APK for " + name + '\n' + String.join("\n", result.getOut()));
writeLog(TAG + " - AAPT2", "Failed to build APK for " + name, result.getOut());
Log.e(TAG + " - AAPT", "Failed to build APK for " + name + '\n' + String.join("\n", result.getOut()));
writeLog(TAG + " - AAPT", "Failed to build APK for " + name, result.getOut());
}

return !result.isSuccess();
Expand Down

0 comments on commit 69f8be9

Please sign in to comment.