diff --git a/app/src/main/java/com/drdisagree/iconify/utils/compiler/OnBoardingCompiler.java b/app/src/main/java/com/drdisagree/iconify/utils/compiler/OnBoardingCompiler.java index 620f70832..6452dd156 100644 --- a/app/src/main/java/com/drdisagree/iconify/utils/compiler/OnBoardingCompiler.java +++ b/app/src/main/java/com/drdisagree/iconify/utils/compiler/OnBoardingCompiler.java @@ -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) { @@ -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(); } diff --git a/app/src/main/java/com/drdisagree/iconify/utils/compiler/OverlayCompiler.java b/app/src/main/java/com/drdisagree/iconify/utils/compiler/OverlayCompiler.java index bd1732ff1..1c115eab8 100644 --- a/app/src/main/java/com/drdisagree/iconify/utils/compiler/OverlayCompiler.java +++ b/app/src/main/java/com/drdisagree/iconify/utils/compiler/OverlayCompiler.java @@ -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(); @@ -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();