From 618de55bd332d7f838c25ad59c052da51622b103 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Tue, 18 Dec 2018 17:37:04 -0500
Subject: [PATCH] fix: update AaptManager to handle flattened aapt structure

---
 brut.j.util/src/main/java/brut/util/AaptManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 a4b782a0..2042d82d 100644
--- a/brut.j.util/src/main/java/brut/util/AaptManager.java
+++ b/brut.j.util/src/main/java/brut/util/AaptManager.java
@@ -41,11 +41,11 @@ public class AaptManager {
 
         try {
             if (OSDetection.isMacOSX()) {
-                aaptBinary = Jar.getResourceAsFile("/prebuilt/" + aaptVersion + "/macosx/" + aaptVersion, AaptManager.class);
+                aaptBinary = Jar.getResourceAsFile("/prebuilt/macosx/" + aaptVersion, AaptManager.class);
             } 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()) {
-                aaptBinary = Jar.getResourceAsFile("/prebuilt/" + aaptVersion + "/windows/" + aaptVersion + ".exe", AaptManager.class);
+                aaptBinary = Jar.getResourceAsFile("/prebuilt/windows/" + aaptVersion + ".exe", AaptManager.class);
             } else {
                 throw new BrutException("Could not identify platform: " + OSDetection.returnOS());
             }