commit c84e62f93a659aa8d6a615f4dcece356e3d04066
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Sep 22 08:17:53 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Sep 22 12:33:24 2023 +0000
tree 530feb10ce5492fe0a09b37eb9a0f5b6c3c4b2bd
parent 782d768b6ead82ea9158ce4b3a9a8b0491ea754e

Allow parsing of relocator marker

Bug: b/170804645
Change-Id: Iee1db94d5e65cfb05972b67793fc51fb59875b9e

src/main/java/com/android/tools/r8/dex/Marker.java

diff --git a/src/main/java/com/android/tools/r8/dex/Marker.java b/src/main/java/com/android/tools/r8/dex/Marker.java
index 0fa52a1..c507995 100644
--- a/src/main/java/com/android/tools/r8/dex/Marker.java
+++ b/src/main/java/com/android/tools/r8/dex/Marker.java
@@ -52,6 +52,7 @@
   private static final String D8_PREFIX = PREFIX + Tool.D8 + "{";
   private static final String R8_PREFIX = PREFIX + Tool.R8 + "{";
   private static final String L8_PREFIX = PREFIX + Tool.L8 + "{";
+  private static final String RELOCATOR_PREFIX = PREFIX + Tool.Relocator + "{";
 
   private final JsonObject jsonObject;
   private final Tool tool;
@@ -272,6 +273,9 @@
       if (str.startsWith(L8_PREFIX)) {
         return internalParse(Tool.L8, str.substring(L8_PREFIX.length() - 1));
       }
+      if (str.startsWith(RELOCATOR_PREFIX)) {
+        return internalParse(Tool.Relocator, str.substring(RELOCATOR_PREFIX.length() - 1));
+      }
     }
     return null;
   }