From 61848cfa06efb859bfcac1df3ac8f6ec8062de2b Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Fri, 4 Jan 2019 11:24:49 -0500
Subject: [PATCH] fix: allow AaptManager to find new naming of aapt binaries

---
 brut.j.util/src/main/java/brut/util/AaptManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/brut.j.util/src/main/java/brut/util/AaptManager.java b/brut.j.util/src/main/java/brut/util/AaptManager.java
index 2042d82d..1d3f2efd 100644
--- a/brut.j.util/src/main/java/brut/util/AaptManager.java
+++ b/brut.j.util/src/main/java/brut/util/AaptManager.java
@@ -35,10 +35,13 @@ public class AaptManager {
         File aaptBinary;
         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.");
         }
 
+        // Set the 64 bit flag
+        aaptVersion += OSDetection.is64Bit() ? "_64" : "";
+
         try {
             if (OSDetection.isMacOSX()) {
                 aaptBinary = Jar.getResourceAsFile("/prebuilt/macosx/" + aaptVersion, AaptManager.class);