diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index 161b122c..cbe7dbe8 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -774,8 +774,21 @@ final public class AndrolibResources { try { if (OSDetection.isMacOSX()) { aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/aapt"); + + /* + Need to build these still. + if (OSDetection.is64Bit()) { + aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/64/aapt"); + } else { + aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/32/aapt"); + } + */ } else if (OSDetection.isUnix()) { - aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/aapt"); + if (OSDetection.is64Bit()) { + aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/64/aapt"); + } else { + aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/32/aapt"); + } } else if (OSDetection.isWindows()) { aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe"); } else { diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/32/aapt b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/32/aapt new file mode 100755 index 00000000..d9764cbf Binary files /dev/null and b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/32/aapt differ diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/64/aapt b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/64/aapt new file mode 100755 index 00000000..32f9f867 Binary files /dev/null and b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/64/aapt differ diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/aapt b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/aapt deleted file mode 100755 index c45a583c..00000000 Binary files a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/linux/aapt and /dev/null differ diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/windows/aapt.exe b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/windows/aapt.exe index 597541c1..7827c893 100755 Binary files a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/windows/aapt.exe and b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/windows/aapt.exe differ