Drop 32 bit binaries

- update unix/win/mac 64 bit binaries
 - fixes #1598
 - refs #1594
This commit is contained in:
Connor Tumbleson
2017-08-24 15:53:52 -04:00
parent 91ef166ffb
commit fa966d2d66
7 changed files with 10 additions and 23 deletions

View File

@ -788,19 +788,15 @@ final public class AndrolibResources {
public File getAaptBinaryFile() throws AndrolibException {
File aaptBinary;
if (! OSDetection.is64Bit()) {
throw new AndrolibException("32 bit OS detected. No 32 bit binaries available.");
}
try {
if (OSDetection.isMacOSX()) {
if (OSDetection.is64Bit()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/64/aapt", AndrolibResources.class);
} else {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/32/aapt", AndrolibResources.class);
}
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/aapt", AndrolibResources.class);
} else if (OSDetection.isUnix()) {
if (OSDetection.is64Bit()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/64/aapt", AndrolibResources.class);
} else {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/32/aapt", AndrolibResources.class);
}
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/aapt", AndrolibResources.class);
} else if (OSDetection.isWindows()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe", AndrolibResources.class);
} else {