fixes #440 includes prebuilt aapt binaries

This commit is contained in:
Connor Tumbleson 2013-03-29 14:42:35 -05:00
parent 73c0bccaf0
commit 0c5871687f
5 changed files with 9 additions and 5 deletions

View File

@ -3,6 +3,7 @@ v2.0.0 (TBA)
-Fixed (issue #403) - Uses new usage output to cleanup organization of features. -Fixed (issue #403) - Uses new usage output to cleanup organization of features.
-Fixed (issue #359) - Correclty handles malformed 9patch images. (Thanks Felipe Richards) -Fixed (issue #359) - Correclty handles malformed 9patch images. (Thanks Felipe Richards)
-Fixed (issue #401) - Uses versionInfo meta to correctly parse versionName and versionCode -Fixed (issue #401) - Uses versionInfo meta to correctly parse versionName and versionCode
-Fixed (issue #440) - Include aapt binaries within Apktool to have closer control over build.
v1.5.3 (TBA) v1.5.3 (TBA)
-Updated to smali/baksmali to v1.4.2 -Updated to smali/baksmali to v1.4.2

View File

@ -758,8 +758,11 @@ final public class AndrolibResources {
} }
/** /**
* * Using a prebuilt aapt and forcing its use, allows us to prevent bugs from older aapt's
* @see https://github.com/iBotPeaches/platform_frameworks_base * along with having a finer control over the build procedure.
*
* Aapt can still be over
* @url https://github.com/iBotPeaches/platform_frameworks_base
* @return * @return
* @throws AndrolibException * @throws AndrolibException
*/ */
@ -767,13 +770,13 @@ final public class AndrolibResources {
try { try {
if (OSDetection.isMacOSX()) { if (OSDetection.isMacOSX()) {
mAaptBinary = Jar mAaptBinary = Jar
.getResourceAsFile("/aapt/macosx/aapt"); .getResourceAsFile("/prebuilt/aapt/macosx/aapt");
} else if (OSDetection.isUnix()) { } else if (OSDetection.isUnix()) {
mAaptBinary = Jar mAaptBinary = Jar
.getResourceAsFile("/aapt/linux/aapt"); .getResourceAsFile("/prebuilt/aapt/linux/aapt");
} else if (OSDetection.isWindows()) { } else if (OSDetection.isWindows()) {
mAaptBinary = Jar mAaptBinary = Jar
.getResourceAsFile("/aapt/windows/aapt.exe"); .getResourceAsFile("/prebuilt/aapt/windows/aapt.exe");
} else { } else {
return null; return null;
} }