diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java index 6f3fb8ca..3371a6c3 100644 --- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java +++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java @@ -416,7 +416,6 @@ public class Main { } } - private static void usage(CommandLine commandLine) { // load basicOptions 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 9d7f4743..59b830b0 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 @@ -369,6 +369,11 @@ final public class AndrolibResources { if (mMaxSdkVersion != null) { cmd.add("--max-sdk-version"); cmd.add(mMaxSdkVersion); + + // if we have max sdk version, set --max-res-version + // so we can ignore anything over that during build. + cmd.add("--max-res-version"); + cmd.add(mMaxSdkVersion); } if (mPackageRenamed != null) { cmd.add("--rename-manifest-package"); @@ -407,7 +412,6 @@ final public class AndrolibResources { if (rawDir != null) { cmd.add(rawDir.getAbsolutePath()); } - try { OS.exec(cmd.toArray(new String[0])); } catch (BrutException ex) {