commit a8cf7c9af311e5c56eb5f4fb29cd84d674c94d57
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jan 05 08:48:30 2024 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Jan 05 08:48:30 2024 +0100
tree 7ebf4cbff59a19a1da0c41aa1c07d53f16ba2920
parent 2e1d6500e1b43771a0bba0b5dc4d08653a993fb7

Property to disable vertical class merging

Bug: b/318461353
Change-Id: Ib06532a6f86f82ec3fe5f541aebcfb016b2eab99

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 c5aa86e..289ccdb 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -338,7 +338,8 @@
   // Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations.
   public boolean enableFieldBitAccessAnalysis =
       System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null;
-  public boolean enableVerticalClassMerging = true;
+  public boolean enableVerticalClassMerging =
+      System.getProperty("com.android.tools.r8.noVerticalClassMerging") == null;
   public boolean enableUnusedInterfaceRemoval = true;
   public boolean enableDevirtualization = true;
   public boolean enableEnumUnboxing = true;