| commit | d5ec9706606f21779334191e135fb3613c1aba80 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Sun Apr 26 18:30:40 2020 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Sun Apr 26 18:30:40 2020 +0200 |
| tree | c5dd406e152e2e82abc5b85d20df71443b9fe1d9 | |
| parent | 13e5c436e16b07cd9c25a3962d54655eee5b81c2 [diff] |
Fix AssertionError in Signal-Android Change-Id: I6672025dd337b305e53eb28d1a9c238e414b8c8c
diff --git a/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java b/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java index b92f82e..b46840b 100644 --- a/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java +++ b/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java
@@ -121,7 +121,8 @@ } private boolean isEnum(DexType valueType) { - return appInfo.isSubtype(valueType, appInfo.dexItemFactory().enumType); + return valueType.isClassType() + && appInfo.isSubtype(valueType, appInfo.dexItemFactory().enumType); } private boolean isAnnotation(DexType valueType) {