commit c401ea66bc21703dbcbba933359d79a76a3f5088
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jan 21 08:26:46 2022 +0100
committer Christoffer Adamsen <christofferqa@google.com> Fri Jan 21 08:36:17 2022 +0000
tree 7df8d68febf15ab2c8dfa354467a0d334520a87c
parent 8cbe4359ae18d71c5e8f4d65c4b87167dc0a42c2

Accept -identifiernamestring warning in GMSCoreLatestTest

Change-Id: I9a24eff63a5dd0be2253569ff6468a25450c96a2

src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java b/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
index 97d8b7a..0253287 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
@@ -4,6 +4,7 @@
 package com.android.tools.r8.internal;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.core.AnyOf.anyOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -15,6 +16,7 @@
 import com.android.tools.r8.ThrowableConsumer;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.AssertionUtils;
+import com.android.tools.r8.utils.StringUtils;
 import com.google.common.collect.Sets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -122,6 +124,14 @@
         .assertAllWarningMessagesMatch(
             anyOf(
                 containsString("Expected stack map table for method with non-linear control flow."),
-                containsString("Ignoring option: -outjars")));
+                containsString("Ignoring option: -outjars"),
+                equalTo(
+                    StringUtils.joinLines(
+                        "Rule matches the static final field `java.lang.String com.google.protobuf."
+                            + "GeneratedExtensionRegistryLoader.LITE_CLASS_NAME`, which may have "
+                            + "been inlined: -identifiernamestring class com.google.protobuf."
+                            + "GeneratedExtensionRegistryLoader {",
+                        "  private static final java.lang.String LITE_CLASS_NAME;",
+                        "}"))));
   }
 }