Version 2.2.44 Fix incorrect merge Bug: 172856713 Bug: 173078091 Bug: 173184123 Bug: 172895918 Change-Id: I861528dbd8f160fa979be24bfd888aabaf6b7646
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index e07e937..8b59e2f 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.43"; + public static final String LABEL = "2.2.44"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java index 35c201a..47eb2b9 100644 --- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java +++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1584,7 +1584,7 @@ } // Warn if the class extends an interface or implements a class - warnIfLibraryExtendsInterfaceOrImplementsClass(holder); + warnIfClassExtendsInterfaceOrImplementsClass(holder); // If this is an interface that has just become live, then report previously seen but unreported // implemented-by edges.