commit 88ef889ffe2f8500aeaeafe7a08388ad98f34cfb
author Christoffer Adamsen <christofferqa@google.com> Fri Jan 10 14:26:23 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Fri Jan 10 14:26:23 2025 +0100
tree a658762d929ed87a9b2ff5eaeb5e9b3c7889d0e3
parent 006f3be8b5c6099e25eb956d763418562522dcb0

Account for types bound in distributor

Fixes: b/388542826
Change-Id: I88878726c8ed68816b3aa98518f731afa934d11d

src/main/java/com/android/tools/r8/dex/VirtualFile.java

diff --git a/src/main/java/com/android/tools/r8/dex/VirtualFile.java b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
index c8f16fc..1f73eb5 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -286,8 +286,9 @@
   }
 
   public boolean isFull(int maxEntries) {
-    return (transaction.getNumberOfMethods() > maxEntries)
-        || (transaction.getNumberOfFields() > maxEntries);
+    return transaction.getNumberOfMethods() > maxEntries
+        || transaction.getNumberOfFields() > maxEntries
+        || transaction.getNumberOfTypes() > maxEntries;
   }
 
   public boolean isFull() {
@@ -306,6 +307,10 @@
     return transaction.getNumberOfClasses();
   }
 
+  public int getNumberOfTypes() {
+    return transaction.getNumberOfTypes();
+  }
+
   void throwIfFull(boolean hasMainDexList, Reporter reporter) {
     if (!isFull()) {
       return;
@@ -1119,6 +1124,10 @@
       return classes.size() + base.classes.size();
     }
 
+    int getNumberOfTypes() {
+      return types.size() + base.types.size();
+    }
+
     int getNumberOfFields() {
       return fields.size() + base.getNumberOfFields();
     }