From b4db7735a5298aac71743f71260b977b4ea96436 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Mon, 19 Nov 2012 07:56:19 -0600 Subject: [PATCH] only check for layoutDir if over sdk 17 --- .../brut/androlib/res/AndrolibResources.java | 19 ------------------- .../androlib/res/decoder/ARSCDecoder.java | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index cd515577..0d5e656b 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -190,23 +190,6 @@ final public class AndrolibResources { mMaxSdkVersion = map.get("maxSdkVersion"); } } - - public void prepPath() throws AndrolibException { - List cmd = new ArrayList(); - - // check for win vs linux - if (System.getProperty("os.name").indexOf("win") >= 0) { - cmd.add("set PATH=%PATH%;" + System.getProperty("user.dir")); - } else { - cmd.add("export PATH=$PATH:" + System.getProperty("user.dir")); - } - - try { - OS.exec(cmd.toArray(new String[0])); - } catch (BrutException ex) { - throw new AndrolibException(ex); - } - } public void aaptPackage(File apkFile, File manifest, File resDir, File rawDir, File assetDir, File[] include, HashMap flags) @@ -493,8 +476,6 @@ final public class AndrolibResources { entry.setCrc(crc.getValue()); out.putNextEntry(entry); out.write(data); - zip.close(); - LOGGER.info("Framework installed to: " + outFile); } catch (ZipException ex) { throw new AndrolibException(ex); diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java index 72e6ff93..51d854d8 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java @@ -274,7 +274,7 @@ public class ARSCDecoder { } short layoutDirection = 0; - if (size >= 38 && !this.mPkg.getName().equalsIgnoreCase("com.htc")) { + if (size >= 38 && sdkVersion >= 17 && !this.mPkg.getName().equalsIgnoreCase("com.htc")) { layoutDirection = mIn.readShort(); }