ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-06-12 13:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

aapt2: refactor loading of aapt/aapt2 binaries

Browse Source 
- change: die out if invalid aapt path is provided
This commit is contained in:
Connor Tumbleson
2018-02-28 11:25:56 -05:00
parent f05bd31e59
commit d2c808dd7d
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
brut.j.util/src/main/java/brut/util/AaptManager.java
View File

@ -33,7 +33,7 @@ public class AaptManager {
private static File getAppt(Integer version) throws BrutException {
File aaptBinary;
String aaptVersion = "aapt" + (version == 2 ? "2" : "");
String aaptVersion = getAaptBinaryName(version);
if (! OSDetection.is64Bit() && ! OSDetection.isWindows()) {
throw new BrutException("32 bit OS detected. No 32 bit binaries available.");
@ -60,10 +60,28 @@ public class AaptManager {
throw new BrutException("Can't set aapt binary as executable");
}
public static String getAaptExecutionCommand(String aaptPath, File aapt) throws BrutException {
if (! aaptPath.isEmpty()) {
File aaptFile = new File(aaptPath);
if (aaptFile.canRead() && aaptFile.exists()) {
aaptFile.setExecutable(true);
return aaptFile.getPath();
} else {
throw new BrutException("binary could not be read: " + aaptFile.getAbsolutePath());
}
} else {
return aapt.getAbsolutePath();
}
}
public static int getAaptVersion(String aaptLocation) throws BrutException {
return getApptVersion(new File(aaptLocation));
}
public static String getAaptBinaryName(Integer version) {
return "aapt" + (version == 2 ? "2" : "");
}
public static int getApptVersion(File aapt) throws BrutException {
if (!aapt.isFile()) {
throw new BrutException("Could not identify aapt binary as executable.");