From 21e9dd514c25f334f88a5012074a828184f6479b Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Tue, 19 Sep 2017 14:42:14 -0400 Subject: [PATCH] cs cleanup --- .../java/brut/androlib/res/AndrolibResources.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 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 5b457620..b8d07ce6 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 @@ -307,17 +307,11 @@ final public class AndrolibResources { mSharedLibrary = flag; } - // Ensure that targetSdkVersion is between minSdkVersion/maxSdkVersion if - // they are specified. - private String checkTargetSdkVersionBounds() - { + private String checkTargetSdkVersionBounds() { int target = Integer.parseInt(mTargetSdkVersion); int min = (mMinSdkVersion != null) ? Integer.parseInt(mMinSdkVersion) : 0; int max = (mMaxSdkVersion != null) ? Integer.parseInt(mMaxSdkVersion) : target; - // Your APK seems broken otherwise. - assert (min <= max); - target = Math.min(max, target); target = Math.max(min, target); return Integer.toString(target); @@ -384,6 +378,9 @@ final public class AndrolibResources { } if (mTargetSdkVersion != null) { cmd.add("--target-sdk-version"); + + // Ensure that targetSdkVersion is between minSdkVersion/maxSdkVersion if + // they are specified. cmd.add(checkTargetSdkVersionBounds()); } if (mMaxSdkVersion != null) {