| 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 7e788e156..959d31348 100644 |
| --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java |
| +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java |
| @@ -168,8 +168,8 @@ public class InternalOptions { |
| |
| // Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations. |
| public boolean enableDynamicTypeOptimization = true; |
| - public boolean enableHorizontalClassMerging = true; |
| - public boolean enableVerticalClassMerging = true; |
| + public boolean enableHorizontalClassMerging = false; |
| + public boolean enableVerticalClassMerging = false; |
| public boolean enableArgumentRemoval = true; |
| public boolean enableUnusedArgumentRemoval = true; |
| public boolean enableUnusedInterfaceRemoval = true; |
| @@ -901,7 +901,7 @@ public class InternalOptions { |
| public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport"; |
| public static final String METHOD_PREFIX = "outline"; |
| |
| - public boolean enabled = true; |
| + public boolean enabled = System.getProperty("com.android.tools.r8.disableOutlining") == null; |
| public int minSize = 3; |
| public int maxSize = 99; |
| public int threshold = 20; |
