commit 87778ab0b6c3e232cac3363c774e8ad021c01cbb
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 23 15:36:28 2024 +0100
committer Christoffer Adamsen <christofferqa@google.com> Tue Jan 23 14:38:54 2024 +0000
tree 79a021af6c66d7fd656311e522ff722f49ba9dbc
parent d47b0205226df7361ec35c52f30323c4c20af68d

Enable final round of class merging in L8

Fixes: b/320431939
Change-Id: I6a7e096cbe671c53764487d9848a099c6b68ebb2

src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMergerOptions.java

diff --git a/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMergerOptions.java b/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMergerOptions.java
index 0accf81..31d25ab 100644
--- a/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMergerOptions.java
+++ b/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMergerOptions.java
@@ -21,14 +21,8 @@
   }
 
   public boolean isEnabled(ClassMergerMode mode) {
-    if (!enabled || !options.isOptimizing() || !options.isShrinking()) {
-      return false;
-    }
-    // TODO(b/320431939): Enable final round of vertical class merging for desugared library.
-    if (mode.isFinal() && !options.synthesizedClassPrefix.isEmpty()) {
-      return false;
-    }
-    return true;
+    assert mode != null;
+    return enabled && options.isOptimizing() && options.isShrinking();
   }
 
   public void setEnabled(boolean enabled) {