| commit | cd1fcbd804d53e44ddb4a4ff12f7fdf097fe10cc | [log] [tgz] |
|---|---|---|
| author | Søren Gjesse <sgjesse@google.com> | Mon Feb 22 15:39:34 2021 +0100 |
| committer | Søren Gjesse <sgjesse@google.com> | Tue Feb 23 14:55:26 2021 +0000 |
| tree | add7c9fa53b393da503d95989b2df27fbab260f5 | |
| parent | 7e066354fab9c29b6c3ccac3df86baa6d0cb0b48 [diff] |
Don't use the '-' character in class names for synthetics This is to work around https://issuetracker.google.com/178805864 until lint updates have landed everywhere. Change-Id: I4365700d7e458308096339442ae950fc9ed5a9e0
diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticNaming.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticNaming.java index 25e59ae..1b80f41 100644 --- a/src/main/java/com/android/tools/r8/synthesis/SyntheticNaming.java +++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticNaming.java
@@ -63,7 +63,7 @@ } } - private static final String SYNTHETIC_CLASS_SEPARATOR = "-$$"; + private static final String SYNTHETIC_CLASS_SEPARATOR = "$$"; /** * The internal synthetic class separator is only used for representing synthetic items during * compilation. In particular, this separator must never be used to write synthetic classes to the
diff --git a/src/test/examplesAndroidO/multidex004/ref-list-1.txt b/src/test/examplesAndroidO/multidex004/ref-list-1.txt index c817c33..bd195b3 100644 --- a/src/test/examplesAndroidO/multidex004/ref-list-1.txt +++ b/src/test/examplesAndroidO/multidex004/ref-list-1.txt
@@ -1,4 +1,4 @@ -Lmultidex004/MainActivity-$$ExternalSyntheticLambda0; +Lmultidex004/MainActivity$$ExternalSyntheticLambda0; Lmultidex004/MainActivity; Lmultidex004/VersionInterface; Lmultidex004/VersionStatic;