diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-12 11:16:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-12 11:16:33 +0000 |
| commit | 1354be504df3a829c161b7edbdb5b7c4384d5a60 (patch) | |
| tree | e90fbe653870d4e09c3a940f2b3156055b9179c9 | |
| parent | 2a0cc45e956566ac232a4889fe16a276490036ef (diff) | |
| parent | 5db2e2633acadd2aae167693a79af88f8cef6245 (diff) | |
| download | smali-1354be504df3a829c161b7edbdb5b7c4384d5a60.tar.gz | |
Merge "Remove core-junit from API 26 and above"
am: 5db2e2633a
Change-Id: I82699c3f6f9b07343a0c870a7ae638f61d2c3bac
| -rw-r--r-- | baksmali/src/main/java/org/jf/baksmali/main.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java index 2d6ed8c4..86f43d82 100644 --- a/baksmali/src/main/java/org/jf/baksmali/main.java +++ b/baksmali/src/main/java/org/jf/baksmali/main.java @@ -591,8 +591,7 @@ public class main { "/system/framework/android.policy.jar", "/system/framework/services.jar", "/system/framework/apache-xml.jar"); - } else { // api >= 21 - // TODO: verify, add new ones? + } else if (apiLevel < 26) { return Lists.newArrayList( "/system/framework/core-libart.jar", "/system/framework/conscrypt.jar", @@ -607,6 +606,21 @@ public class main { "/system/framework/mms-common.jar", "/system/framework/android.policy.jar", "/system/framework/apache-xml.jar"); + } else { // api >= 26 + // TODO: verify, add new ones? + return Lists.newArrayList( + "/system/framework/core-libart.jar", + "/system/framework/conscrypt.jar", + "/system/framework/okhttp.jar", + "/system/framework/bouncycastle.jar", + "/system/framework/ext.jar", + "/system/framework/framework.jar", + "/system/framework/telephony-common.jar", + "/system/framework/voip-common.jar", + "/system/framework/ims-common.jar", + "/system/framework/mms-common.jar", + "/system/framework/android.policy.jar", + "/system/framework/apache-xml.jar"); } } } |