commit | 30ed6fb7cea5fafc6eacc84767bd3e140c4fead4 | [log] [tgz] |
---|---|---|
author | Søren Gjesse <sgjesse@google.com> | Thu Sep 02 12:06:22 2021 +0200 |
committer | Søren Gjesse <sgjesse@google.com> | Thu Sep 02 12:06:22 2021 +0200 |
tree | 89a05ae3590015cafcb8fe5850f1bbf9184b88a2 | |
parent | 766bde5b33187affd8c177245f7bc1e3eeca3de6 [diff] |
Version 2.2.84 Fix merge issue in 2.2.83. Bug: 197625454 Change-Id: I88830a8b7373e37acf17dfdc8adfcde22618476e
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 06e4d88..9405530 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "2.2.83"; + public static final String LABEL = "2.2.84"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/graph/DexType.java b/src/main/java/com/android/tools/r8/graph/DexType.java index b1892bf..2778ed4 100644 --- a/src/main/java/com/android/tools/r8/graph/DexType.java +++ b/src/main/java/com/android/tools/r8/graph/DexType.java
@@ -148,6 +148,10 @@ classConsumer.accept(this, arg); } + public String getTypeName() { + return toSourceString(); + } + @Override public String toSourceString() { if (toStringCache == null) {