commit 72d7d9ed5130676150a740ed4bb254cfc2f1ab51
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Nov 05 15:27:33 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Nov 05 15:27:33 2021 +0100
tree 3e5e372e089a5d50fa568c64b50bea902cbbfa28
parent 79a36a4e8d27e5b5d6b94b1215a8bd30f437da10

Temporary option for disabling interface merging

Change-Id: I8650a006aeb2a68fe20a12493728f4ef309bbce0
Bug: 205166439

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 99650a8..ff6cad4 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1281,6 +1281,8 @@
     private boolean enable =
         !Version.isDevelopmentVersion()
             || System.getProperty("com.android.tools.r8.disableHorizontalClassMerging") == null;
+    private boolean enableInterfaceMerging =
+        System.getProperty("com.android.tools.r8.disableHorizontalInterfaceMerging") == null;
     private boolean enableInterfaceMergingInInitial = false;
     private boolean enableSyntheticMerging = true;
     private boolean ignoreRuntimeTypeChecksForTesting = false;
@@ -1332,6 +1334,9 @@
     }
 
     public boolean isInterfaceMergingEnabled(HorizontalClassMerger.Mode mode) {
+      if (!enableInterfaceMerging) {
+        return false;
+      }
       if (mode.isInitial()) {
         return enableInterfaceMergingInInitial;
       }