Do not use inner class separator when adding suffix to name Bug: 183360546 Change-Id: If74be54cb20a0abbb32487637ab3b51340bc9f7d
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; }