commit 2b4d329cc1a7e18987ed18046da489bc03c1c3e7
author Paul Duffin <paulduffin@google.com> Mon Dec 12 11:23:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 12 11:23:03 2016 +0000
tree e90fbe653870d4e09c3a940f2b3156055b9179c9
parent 2a0cc45e956566ac232a4889fe16a276490036ef
parent 1354be504df3a829c161b7edbdb5b7c4384d5a60

Merge "Remove core-junit from API 26 and above" am: 5db2e2633a
am: 1354be504d

Change-Id: I54ea50898073bff164c5a078cf95f149e6ddd0ca

baksmali/src/main/java/org/jf/baksmali/main.java

diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java
index 2d6ed8c..86f43d8 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 @@
                     "/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 @@
                     "/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");
         }
     }
 }