commit c22e880c9fb55ab0b1cb4cbc280af90d1b99b44d
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 22 15:14:10 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 22 15:14:10 2019 +0100
tree 887341aac761e1683ea08b4528307080b9409591
parent 24729c71adfc26c37cc48e298c7f189f54f98a60

Use android.jar corresponding to api 28 for AndroidApiLevel.P

Change-Id: I3f368c54246f607d18cee4974e7b3ae475b66c92

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index bab857c..e4a809c 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -614,10 +614,6 @@
   }
 
   public static Path getAndroidJar(AndroidApiLevel apiLevel) {
-    if (apiLevel == AndroidApiLevel.P) {
-      // TODO(mikaelpeltier) Android P does not yet have his android.jar use the O version
-      apiLevel = AndroidApiLevel.O;
-    }
     String jar = String.format(
         ANDROID_JAR_PATTERN,
         (apiLevel == AndroidApiLevel.getDefault() ? DEFAULT_MIN_SDK : apiLevel).getLevel());