ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-20 16:57:34 +01:00
Code Issues Projects Releases Wiki Activity

Support bounding targetSdkVersion between minSdkVersion and maxSdkVersion

Browse Source 
It is possible to create a an AndroidStudio project that uses the following
nonsense settings:

    defaultConfig {
        minSdkVersion 15
        maxSdkVersion 19
        targetSdkVersion 25
    }

The application is successfully built by Android Studio, and the APK
works when installed on the relevant devices, however the app cannot
be re-built with Apktool afterwards.

This patch works around the problem by explicitly setting the
targetSdkVersion to the max of the maxSdkVersion and min of the minSdkVersion
only if these are specified.
This commit is contained in:
Jan Vidar Krey 2017-09-15 16:24:11 +02:00
parent d00e60c3cf
commit 5f0d53ba20
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,6 +307,22 @@ final public class AndrolibResources {
mSharedLibrary = flag;
}
// Ensure that targetSdkVersion is between minSdkVersion/maxSdkVersion if
// they are specified.
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);
}
public void aaptPackage(File apkFile, File manifest, File resDir, File rawDir, File assetDir, File[] include)
throws AndrolibException {
@ -368,7 +384,7 @@ final public class AndrolibResources {
}
if (mTargetSdkVersion != null) {
cmd.add("--target-sdk-version");
cmd.add(mTargetSdkVersion);
cmd.add(checkTargetSdkVersionBounds());
}
if (mMaxSdkVersion != null) {
cmd.add("--max-sdk-version");