fix: update AaptManager to handle flattened aapt structure

This commit is contained in:
Connor Tumbleson 2018-12-18 17:37:04 -05:00
parent b0a7e64615
commit 618de55bd3

View File

@ -41,11 +41,11 @@ public class AaptManager {
try { try {
if (OSDetection.isMacOSX()) { if (OSDetection.isMacOSX()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/" + aaptVersion + "/macosx/" + aaptVersion, AaptManager.class); aaptBinary = Jar.getResourceAsFile("/prebuilt/macosx/" + aaptVersion, AaptManager.class);
} else if (OSDetection.isUnix()) { } else if (OSDetection.isUnix()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/" + aaptVersion + "/linux/" + aaptVersion, AaptManager.class); aaptBinary = Jar.getResourceAsFile("/prebuilt/linux/" + aaptVersion, AaptManager.class);
} else if (OSDetection.isWindows()) { } else if (OSDetection.isWindows()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/" + aaptVersion + "/windows/" + aaptVersion + ".exe", AaptManager.class); aaptBinary = Jar.getResourceAsFile("/prebuilt/windows/" + aaptVersion + ".exe", AaptManager.class);
} else { } else {
throw new BrutException("Could not identify platform: " + OSDetection.returnOS()); throw new BrutException("Could not identify platform: " + OSDetection.returnOS());
} }