commit 165906975b0e8d0aa7eeccd975786d07c689d6dd
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 22 11:29:20 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 22 12:22:12 2021 +0000
tree 8a5a66f0c79b2bf7faafb88bde2fc6aaf4d2d75f
parent 8fb133932045f7706575c7470ce92217b09c5b25

Do not use inner class separator when adding suffix to name

Bug: 183360546
Change-Id: If74be54cb20a0abbb32487637ab3b51340bc9f7d

src/main/java/com/android/tools/r8/repackaging/Repackaging.java

diff --git a/src/main/java/com/android/tools/r8/repackaging/Repackaging.java b/src/main/java/com/android/tools/r8/repackaging/Repackaging.java
index c6612c5..188e749 100644
--- a/src/main/java/com/android/tools/r8/repackaging/Repackaging.java
+++ b/src/main/java/com/android/tools/r8/repackaging/Repackaging.java
@@ -428,9 +428,7 @@
       // Ensure that the generated name is unique.
       DexType finalRepackagedDexType = repackagedDexType;
       for (int i = 1; isRepackageTypeUsed(finalRepackagedDexType, mappings, appView); i++) {
-        finalRepackagedDexType =
-            repackagedDexType.addSuffix(
-                Character.toString(INNER_CLASS_SEPARATOR) + i, dexItemFactory);
+        finalRepackagedDexType = repackagedDexType.addSuffix(i + "", dexItemFactory);
       }
       return finalRepackagedDexType;
     }