lots of changes to handling of ARSCDecoder. Needs support to handle something that I don't know yet. Something todo with ResSpecs of dual packages.

apktool-cli/src/main/java/brut/apktool/Main.java

@@ -215,7 +215,7 @@ public class Main {
             "Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>\n" +
             "with smali v" + ApktoolProperties.get("smaliVersion") +
             ", and baksmali v" + ApktoolProperties.get("baksmaliVersion") + "\n" +
-            "Updated by iBotPeaches (@iBotPeaches) and yyj \n" +
+            "Updated by iBotPeaches (@iBotPeaches)\n" +
             "Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)\n" +
             "\n" +
             "Usage: apktool [-q|--quiet OR -v|--verbose] COMMAND [...]\n" +

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

@@ -200,6 +200,7 @@ final public class AndrolibResources {
         cmd.add("aapt");
         cmd.add("p");
         cmd.add("-v"); //mega debug mode.@todo REMOVE ON FINAL
+        
         if (update) {
             cmd.add("-u");
         }

apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java

@@ -266,11 +266,16 @@ public class ARSCDecoder {
 
         short screenWidthDp = 0;
         short screenHeightDp = 0;
+        
         if (size >= 36) {
             screenWidthDp = mIn.readShort();
             screenHeightDp = mIn.readShort();
         }
         
+        if (size >= 40) {
+            mIn.skipBytes(2);
+        }
+
         int exceedingSize = size - KNOWN_CONFIG_BYTES;
         if (exceedingSize > 0) {
             byte[] buf = new byte[exceedingSize];

apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java

@@ -118,7 +118,7 @@ public class BuildAndDecodeTest {
     @Test
     public void qualifiersTest() throws BrutException {
         compareValuesFiles("values-mcc004-mnc4-en-rUS-sw100dp-w200dp-h300dp" +
-                "-xlarge-long-land-night-xhdpi-finger-keyssoft-12key" +
+                "-xlarge-long-land-desk-night-xhdpi-finger-keyssoft-12key" +
                 "-navhidden-dpad/strings.xml");
     }
 

apktool-lib/src/test/resources/brut/apktool/testapp/apktool.yml

@@ -1,4 +1,4 @@
-version: 1.4.7
+version: 1.5.0
 apkFileName: testapp.apk
 isFrameworkApk: false
 usesFramework: