Commit 7294a953 authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Rolling R8 1.6.28 -> 1.7.11

Change-Id: I4a431f966ab297e7c81b7abe8e29ed302b984586
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849181
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705353}
parent bb20bbdd
......@@ -1372,7 +1372,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'VYsSPB6QlnJQH-2vJBhK8T6r0mexvbb9klMKwnK22GoC',
'version': 'W_6e81yiWSvg-zaPh6Ho1HEnaAi3_tApuT7jChFwtFMC',
},
],
'condition': 'checkout_android',
......
Name: R8
URL: https://r8.googlesource.com/r8
Revision: d11d42306845f15f383c1867f0f26c6f36e3adc4
Version: 1.6.28-dev
Revision: e6ec004a7864f4a9e0f1e8e4b4690851e764ef29
Version: 1.7.11-dev
License: BSD 3-Clause
License File: NOT_SHIPPED
Security Critical: no
......
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 c9407a85f..800d6e760 100644
index 89aeb2da4..8ff4f835e 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -186,8 +186,8 @@ public class InternalOptions {
// Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations.
@@ -189,8 +189,8 @@ public class InternalOptions {
public boolean enableDynamicTypeOptimization = true;
public boolean enableFieldBitAccessAnalysis = false;
public boolean enableFieldBitAccessAnalysis =
System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null;
- public boolean enableHorizontalClassMerging = true;
- public boolean enableVerticalClassMerging = true;
+ public boolean enableHorizontalClassMerging = false;
......@@ -13,7 +13,7 @@ index c9407a85f..800d6e760 100644
public boolean enableArgumentRemoval = true;
public boolean enableUnusedArgumentRemoval = true;
public boolean enableUnusedInterfaceRemoval = true;
@@ -902,7 +902,7 @@ public class InternalOptions {
@@ -910,7 +910,7 @@ public class InternalOptions {
public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport";
public static final String METHOD_PREFIX = "outline";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment