Commit a01d4a7e authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Rolling r8 1.6.22 -> 1.6.28

Change-Id: I231e5e1550655976bd81fc72d26aa07fa921a80a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1789743
Auto-Submit: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694267}
parent 9b74f692
...@@ -1316,7 +1316,7 @@ deps = { ...@@ -1316,7 +1316,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/r8', 'package': 'chromium/third_party/r8',
'version': 'PiWJNu1SdDl433fYwX_rFSX3zNZWizTfghShod_8QZ0C', 'version': 'VYsSPB6QlnJQH-2vJBhK8T6r0mexvbb9klMKwnK22GoC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
Name: R8 Name: R8
URL: https://r8.googlesource.com/r8 URL: https://r8.googlesource.com/r8
Revision: c8785efaf448967838de4b1b6a0afea7d4ea5b74 Revision: d11d42306845f15f383c1867f0f26c6f36e3adc4
Version: 1.6.22-dev Version: 1.6.28-dev
License: BSD 3-Clause License: BSD 3-Clause
License File: NOT_SHIPPED License File: NOT_SHIPPED
Security Critical: no 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 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 2b170ba8f..684d496eb 100644 index c9407a85f..800d6e760 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -175,8 +175,8 @@ public class InternalOptions { @@ -186,8 +186,8 @@ public class InternalOptions {
// Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations. // Optimization-related flags. These should conform to -dontoptimize and disableAllOptimizations.
public boolean enableDynamicTypeOptimization = true; public boolean enableDynamicTypeOptimization = true;
public boolean enableFieldBitAccessAnalysis = false;
- public boolean enableHorizontalClassMerging = true; - public boolean enableHorizontalClassMerging = true;
- public boolean enableVerticalClassMerging = true; - public boolean enableVerticalClassMerging = true;
+ public boolean enableHorizontalClassMerging = false; + public boolean enableHorizontalClassMerging = false;
...@@ -13,7 +13,7 @@ index 2b170ba8f..684d496eb 100644 ...@@ -13,7 +13,7 @@ index 2b170ba8f..684d496eb 100644
public boolean enableArgumentRemoval = true; public boolean enableArgumentRemoval = true;
public boolean enableUnusedArgumentRemoval = true; public boolean enableUnusedArgumentRemoval = true;
public boolean enableUnusedInterfaceRemoval = true; public boolean enableUnusedInterfaceRemoval = true;
@@ -941,7 +941,7 @@ public class InternalOptions { @@ -902,7 +902,7 @@ public class InternalOptions {
public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport"; public static final String CLASS_NAME = "com.android.tools.r8.GeneratedOutlineSupport";
public static final String METHOD_PREFIX = "outline"; 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