Version 3.2.80
Resolve merge issues in 3.2.79.
Bug: b/241063980
Change-Id: I4e230bc56a85852719c2c6ad8e1865565f519c8c
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 98a50f4..95825a6 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 = "3.2.79";
+ public static final String LABEL = "3.2.80";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationReader.java b/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
index 662f63d..e256560 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationReader.java
@@ -114,7 +114,7 @@
StringResource proguardMap,
ExecutorService executorService)
throws IOException {
- return read(proguardMap, executorService, false);
+ return read(proguardMap, executorService, true);
}
public final LazyLoadedDexApplication read(
diff --git a/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java b/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
index 99b79e9..cba40d6 100644
--- a/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
+++ b/src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
@@ -109,7 +109,8 @@
}
private static DexProgramClass mergeIfLegacySynthetics(DexProgramClass a, DexProgramClass b) {
- if (a.type.isLegacySynthesizedTypeAllowedDuplication()) {
+ if (a.type.isLegacySynthesizedTypeAllowedDuplication()
+ || a.type.isSynthesizedTypeAllowedDuplication()) {
assert assertEqualClasses(a, b);
return a;
}
