ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-08 19:16:09 +01:00
Code Issues Projects Releases Wiki Activity

add warning for unknown operating system and fix getFrameworkDir to use non hardcode seperator char

Browse Source
This commit is contained in:
Connor Tumbleson 2013-09-17 21:44:57 -05:00
parent 792188b9fe
commit bd9dce78b4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,8 +781,7 @@ final public class AndrolibResources {
if (sFrameworkFolder != null) { if (sFrameworkFolder != null) {
path = sFrameworkFolder; path = sFrameworkFolder;
} else if (OSDetection.isMacOSX()) { } else if (OSDetection.isMacOSX()) {
// store in user-home, for Mac OS X path = System.getProperty("user.home") + File.separatorChar + "Library" + File.separatorChar + "apktool" + File.separatorChar + "framework";
path = System.getProperty("user.home") + File.separatorChar + "Library/apktool/framework";
} else { } else {
path = System.getProperty("user.home") + File.separatorChar + "apktool" + File.separatorChar + "framework"; path = System.getProperty("user.home") + File.separatorChar + "apktool" + File.separatorChar + "framework";
} }
@ -807,7 +806,6 @@ final public class AndrolibResources {
* Aapt can still be overridden via --aapt/-a on build, but specific features will be disabled * Aapt can still be overridden via --aapt/-a on build, but specific features will be disabled
* *
* @url https://github.com/iBotPeaches/platform_frameworks_base * @url https://github.com/iBotPeaches/platform_frameworks_base
* @return
* @throws AndrolibException * @throws AndrolibException
*/ */
public File getAaptBinaryFile() throws AndrolibException { public File getAaptBinaryFile() throws AndrolibException {
@ -822,6 +820,7 @@ final public class AndrolibResources {
mAaptBinary = Jar mAaptBinary = Jar
.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe"); .getResourceAsFile("/prebuilt/aapt/windows/aapt.exe");
} else { } else {
LOGGER.warning("Unknown Operating System: " + OSDetection.returnOS());
return null; return null;
} }
} catch (BrutException ex) { } catch (BrutException ex) {