commit a9153b83b61a2371fa2585ba529e55ec0ad0af02
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 28 07:36:06 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 28 07:36:06 2020 +0100
tree 77a0f9385d94913ce662a05e5e4c7fbe0dadf238
parent fd53e489bc28b2a2583d5ba71ebed7a6661e876d

Fix B137392797 test

Change-Id: I57dddf492d76f787b5897c0c47c6321375ee845b

src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java

diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java b/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
index 47b6198..acb1e86 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
@@ -11,6 +11,7 @@
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.BooleanUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -71,7 +72,8 @@
             "com.squareup.wire.WireField", "com.squareup.demo.myapplication.Test")
         .addKeepMainRule(TestClass.class)
         .addKeepAttributes("*Annotation*")
-        .allowDiagnosticWarningMessages(parameters.isDexRuntime())
+        .allowDiagnosticWarningMessages(
+            parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.N))
         .setMinApi(parameters.getApiLevel())
         .compile()
         .assertAllWarningMessagesMatch(