commit 48bb8db128cb786b2b40ae39801c18cc978fcab2
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Feb 26 22:58:35 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Feb 26 21:59:39 2021 +0000
tree 333aa1ea0fc82e17b98bc86caba1cb18b363a6a0
parent 0e73ec843d0d332fe96cb6e3210baf273b070b2f

Disable check for android jar for api level S

Bug: 181356260
Change-Id: I22cb553a179fadc085b0aea7a62ac564bd9cb26e

src/test/java/com/android/tools/r8/testing/ToolHelperTest.java

diff --git a/src/test/java/com/android/tools/r8/testing/ToolHelperTest.java b/src/test/java/com/android/tools/r8/testing/ToolHelperTest.java
index b0e1ab2..5492f54 100644
--- a/src/test/java/com/android/tools/r8/testing/ToolHelperTest.java
+++ b/src/test/java/com/android/tools/r8/testing/ToolHelperTest.java
@@ -30,7 +30,9 @@
         ToolHelper.getFirstSupportedAndroidJar(AndroidApiLevel.K_WATCH), AndroidApiLevel.L);
     // All android.jar's for API level L are present.
     for (AndroidApiLevel androidApiLevel : AndroidApiLevel.values()) {
-      if (androidApiLevel.isGreaterThanOrEqualTo(AndroidApiLevel.L)) {
+      // TODO(b/181356260): Add AndroidJar for S.
+      if (androidApiLevel.isGreaterThanOrEqualTo(AndroidApiLevel.L)
+          && androidApiLevel.isLessThan(AndroidApiLevel.S)) {
         checkExpectedAndroidJar(
             ToolHelper.getFirstSupportedAndroidJar(androidApiLevel), androidApiLevel);
       }