Pass minimum api level to smali library #1313
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the PR. I have a lot of local work in progress for Android Nougat stuff, but the instant I get that settled I'll get this merged. Thanks again |
iBotPeaches
requested changes
Sep 14, 2016
| @@ -278,6 +279,9 @@ public void build(ExtFile appDir, File outFile) | |||
| mAndRes.setVersionInfo(meta.versionInfo); | |||
| mAndRes.setSharedLibrary(meta.sharedLibrary); | |||
|
|
|||
| if (meta.sdkInfo != null && meta.sdkInfo.get("minSdkVersion") != null) | |||
There was a problem hiding this comment.
Can you use braces for added logic? I try to stay away from single statement control flow as its just prone to errors.
| } | ||
|
|
||
| private void build() throws AndrolibException { | ||
| try { | ||
| DexBuilder dexBuilder = DexBuilder.makeDexBuilder(); | ||
| DexBuilder dexBuilder; | ||
| if (mApiLevel > 0) |
There was a problem hiding this comment.
Same as previous comment, use braces here instead of single statements.
When apktool creates a DexBuilder class, it creates it without specifying a minimum api level. This causes the DexBuilder class to assume api level 20 by default. This is not ideal since in some cases, the concrete minimum api level is required. One such case is in smali's DexWriter class which implements a workaround for a bug in Dalvik that was fixed in Android 4.2 (https://code.google.com/p/android/issues/detail?id=35304) that causes apps that call the Method.getParameterAnnotations api to crash in some cases (see bug report for more details). The workaround that smali implements is only triggered if the minimum api level is below 17 (Android 4.2). But since apktool effectively sets the minimum api level to 20, this code is never triggered causing apktool to create apk files that crash on devices below Android 4.2. This change passes the minimum api level to the smali library.
benjamin-promon
force-pushed
the
smali-api-level
branch
from
b0cf6b7
to
db35f54
Compare
iBotPeaches
approved these changes
Sep 18, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When apktool creates a DexBuilder class, it creates it without specifying a minimum api level. This causes the DexBuilder class to assume api level 20 by default. This is not ideal since in some cases, the concrete minimum api level is required.
One such case is in smali's DexWriter class which implements a workaround for a bug in Dalvik that was fixed in Android 4.2 (https://code.google.com/p/android/issues/detail?id=35304) that causes apps that call the Method.getParameterAnnotations api to crash in some cases (see bug report for more details). The workaround that smali implements is only triggered if the minimum api level is below 17 (Android 4.2). But since apktool effectively sets the minimum api level to 20, this code is never triggered causing apktool to create apk files that crash on devices below Android 4.2.
This change passes the minimum api level to the smali library.