| commit | 18a14ec57b24fa56ab3787e890846ec62fdc714d | [log] [tgz] |
|---|---|---|
| author | Søren Gjesse <sgjesse@google.com> | Mon May 03 08:42:47 2021 +0200 |
| committer | Søren Gjesse <sgjesse@google.com> | Mon May 03 08:42:47 2021 +0200 |
| tree | 85f3ad105a210a1e7a3c56f7d4ef384dc108c119 | |
| parent | b5ac78b450566e04844adb50ed767a2500de468e [diff] |
Revert use of getTypeName in DexItemFactory When running the compilers on older Art VM's Class.getTypeName is not present. This was landed as part of https://r8-review.googlesource.com/c/r8/+/59669. Change-Id: I7bcb8d1026446895c3f86efa1e564c47672196b2
diff --git a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java index 8abedbe..af7f924 100644 --- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java +++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -2298,8 +2298,10 @@ } private DexType createStaticallyKnownType(Class<?> clazz) { + // This uses Class.getName() and not Class.getTypeName(), as the compilers are also + // running on Art versions where Class.getTypeName() is not present (7.0 and before). return createStaticallyKnownType( - createString(DescriptorUtils.javaTypeToDescriptor(clazz.getTypeName()))); + createString(DescriptorUtils.javaTypeToDescriptor(clazz.getName()))); } private DexType createStaticallyKnownType(DexString descriptor) {