fix: allow AaptManager to find new naming of aapt binaries

This commit is contained in:
Connor Tumbleson 2019-01-04 11:24:49 -05:00
parent ec0d58fbad
commit 61848cfa06

View File

@ -35,10 +35,13 @@ public class AaptManager {
File aaptBinary; File aaptBinary;
String aaptVersion = getAaptBinaryName(version); String aaptVersion = getAaptBinaryName(version);
if (! OSDetection.is64Bit() && ! OSDetection.isWindows()) { if (! OSDetection.is64Bit() && OSDetection.isMacOSX()) {
throw new BrutException("32 bit OS detected. No 32 bit binaries available."); throw new BrutException("32 bit OS detected. No 32 bit binaries available.");
} }
// Set the 64 bit flag
aaptVersion += OSDetection.is64Bit() ? "_64" : "";
try { try {
if (OSDetection.isMacOSX()) { if (OSDetection.isMacOSX()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/macosx/" + aaptVersion, AaptManager.class); aaptBinary = Jar.getResourceAsFile("/prebuilt/macosx/" + aaptVersion, AaptManager.class);