ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-06-23 21:40:12 +02:00
Code Issues Projects Releases Wiki Activity

Class.class.getResourceAsStream tries to load resource from root directory. This fails when apktool is built into a fat jar like Spring boot executable so that the classloader tries to load the resource from the root directory of the Spring boot jar instead of that of the bundled appktool jar.

Browse Source
This commit is contained in:
Bing Qiao 2017-06-29 12:36:05 +01:00
parent b45054e65e
commit 28883538a7
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
View File

@ -783,18 +783,18 @@ final public class AndrolibResources {
try {
if (OSDetection.isMacOSX()) {
if (OSDetection.is64Bit()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/64/aapt");
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/64/aapt", AndrolibResources.class);
} else {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/32/aapt");
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/macosx/32/aapt", AndrolibResources.class);
}
} else if (OSDetection.isUnix()) {
if (OSDetection.is64Bit()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/64/aapt");
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/64/aapt", AndrolibResources.class);
} else {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/32/aapt");
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/linux/32/aapt", AndrolibResources.class);
}
} else if (OSDetection.isWindows()) {
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe");
aaptBinary = Jar.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe", AndrolibResources.class);
} else {
LOGGER.warning("Unknown Operating System: " + OSDetection.returnOS());
return null;

26
brut.j.util/src/main/java/brut/util/Jar.java
View File

@ -31,16 +31,20 @@ abstract public class Jar {
private final static Set<String> mLoaded = new HashSet<String>();
private final static Map<String, File> mExtracted =
new HashMap<String, File>();
public static File getResourceAsFile(String name) throws BrutException {
public static File getResourceAsFile(String name, Class clazz) throws BrutException {
File file = mExtracted.get(name);
if (file == null) {
file = extractToTmp(name);
file = extractToTmp(name, clazz);
mExtracted.put(name, file);
}
return file;
}
public static File getResourceAsFile(String name) throws BrutException {
return getResourceAsFile(name, Class.class);
}
public static void load(String libPath) {
if (mLoaded.contains(libPath)) {
return;
@ -56,14 +60,18 @@ abstract public class Jar {
System.load(libFile.getAbsolutePath());
}
public static File extractToTmp(String resourcePath) throws BrutException {
return extractToTmp(resourcePath, "brut_util_Jar_");
public static File extractToTmp(String resourcePath, Class clazz) throws BrutException {
return extractToTmp(resourcePath, "brut_util_Jar_", clazz);
}
public static File extractToTmp(String resourcePath) throws BrutException {
return extractToTmp(resourcePath, Class.class);
}
public static File extractToTmp(String resourcePath, String tmpPrefix)
public static File extractToTmp(String resourcePath, String tmpPrefix, Class clazz)
throws BrutException {
try {
InputStream in = Class.class.getResourceAsStream(resourcePath);
InputStream in = clazz.getResourceAsStream(resourcePath);
if (in == null) {
throw new FileNotFoundException(resourcePath);
}
@ -79,4 +87,8 @@ abstract public class Jar {
"Could not extract resource: " + resourcePath, ex);
}
}
public static File extractToTmp(String resourcePath, String tmpPrefix) throws BrutException {
return extractToTmp(resourcePath, tmpPrefix, Class.class);
}
}