commit 69ec8ff84131353168bacf3b6c03c9615a25c785
author Søren Gjesse <sgjesse@google.com> Thu Oct 02 15:38:02 2025 +0200
committer Søren Gjesse <sgjesse@google.com> Thu Oct 02 15:38:02 2025 +0200
tree c6f60437a32b464c40d48284fa036c1dcc8eae4e
parent 95e825b7628e441afe988b7ee1fa891de40774da

Fix checking of SourceFile attribute for release builds

Bug: b/448608112

Change-Id: I40485d12dfbbb0f6f6b60b950416936b37cd5427

src/test/bootstrap/com/android/tools/r8/bootstrap/SanityCheck.java

diff --git a/src/test/bootstrap/com/android/tools/r8/bootstrap/SanityCheck.java b/src/test/bootstrap/com/android/tools/r8/bootstrap/SanityCheck.java
index b10f50b..89d0115 100644
--- a/src/test/bootstrap/com/android/tools/r8/bootstrap/SanityCheck.java
+++ b/src/test/bootstrap/com/android/tools/r8/bootstrap/SanityCheck.java
@@ -19,6 +19,7 @@
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.Version;
 import com.android.tools.r8.naming.ClassNameMapper;
 import com.android.tools.r8.utils.BooleanBox;
 import com.android.tools.r8.utils.CfUtils;
@@ -83,8 +84,16 @@
                 if (!r8AssistantRuntime.contains(sourceFile)) {
                   if (mapping != null) {
                     assertNotNull(sourceFile);
-                    assertTrue(sourceFile, sourceFile.startsWith("R8_"));
-                    assertEquals(sourceFile.contains("+excldeps") ? 117 : 108, sourceFile.length());
+                    if (Version.isMainVersion()) {
+                      assertTrue(sourceFile, sourceFile.startsWith("R8_"));
+                      assertEquals(
+                          sourceFile.contains("+excldeps") ? 117 : 108, sourceFile.length());
+                    } else {
+                      assertTrue(sourceFile, sourceFile.startsWith("R8_" + Version.LABEL));
+                      assertEquals(
+                          68 + Version.LABEL.length() + (sourceFile.contains("+excldeps") ? 9 : 0),
+                          sourceFile.length());
+                    }
                   } else {
                     // Some class files from third party libraries does not have a SourceFile
                     // attribute.