commit f91c919587711908b6051bb9147d416d416ef809
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 19 14:07:52 2024 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 19 14:07:52 2024 +0100
tree f9fada916883c975addde001a7d7745da08455b8
parent 5b26a10924ad73fa5db0eccd7950abbaacdc6a63

Add a system property to disable horizontal class merging

Bug: b/323220264
Change-Id: I6cac82163e51cb725478cb1460e2a51a51cf8959

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index f284b2c..6ea5e06 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1822,12 +1822,9 @@
 
   public class HorizontalClassMergerOptions {
 
-    // TODO(b/138781768): Set enable to true when this bug is resolved.
     private boolean enable =
-        !Version.isDevelopmentVersion()
-            || System.getProperty("com.android.tools.r8.disableHorizontalClassMerging") == null;
+        System.getProperty("com.android.tools.r8.disableHorizontalClassMerging") == null;
     private boolean enableInitial = true;
-    // TODO(b/205611444): Enable by default.
     private boolean enableClassInitializerDeadlockDetection = true;
     private boolean enableInterfaceMerging =
         System.getProperty("com.android.tools.r8.enableHorizontalInterfaceMerging") != null;