Commit bf9f06ec authored by Eric Stevenson's avatar Eric Stevenson Committed by Commit Bot

Android: Update d8 to 1.2.48.

Includes fix for supporting asserts and invalid locals information.

Bug: 843307
Change-Id: Iec4ecb2981e8c895e728127179d3b0eb54f09b14
Reviewed-on: https://chromium-review.googlesource.com/c/1258963Reviewed-by: default avataragrieve <agrieve@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596239}
parent b0f41089
...@@ -1016,7 +1016,7 @@ deps = { ...@@ -1016,7 +1016,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/r8', 'package': 'chromium/third_party/r8',
'version': 'version:1.2.28-cr0', 'version': 'version:1.2.48',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
Name: R8 Name: R8
URL: https://r8.googlesource.com/r8 URL: https://r8.googlesource.com/r8
Version: 1.2.28-cr0 Version: 1.2.48
License: BSD 3-Clause License: BSD 3-Clause
License File: NOT_SHIPPED License File: NOT_SHIPPED
Security Critical: no Security Critical: no
...@@ -10,18 +10,4 @@ D8 is a dexer that converts java byte code to dex code. ...@@ -10,18 +10,4 @@ D8 is a dexer that converts java byte code to dex code.
It is contained in the R8 repo. It is contained in the R8 repo.
Local Modifications: Local Modifications:
Disabled the code that removes Java asserts. Diff: None
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 5f0ec45e..03612637 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -207,7 +207,7 @@ public class InternalOptions {
// EXPERIMENTAL flag to get behaviour as close to Proguard as possible.
public boolean forceProguardCompatibility = false;
public boolean enableMinification = true;
- public boolean disableAssertions = true;
+ public boolean disableAssertions = false;
public boolean debugKeepRules = false;
// Read input classes into CfCode format (instead of JarCode).
public boolean enableCfFrontend = false;
...@@ -2,4 +2,4 @@ package: chromium/third_party/r8 ...@@ -2,4 +2,4 @@ package: chromium/third_party/r8
description: > description: >
D8 is a dexer that converts java byte code to dex code (part of the R8 repo). D8 is a dexer that converts java byte code to dex code (part of the R8 repo).
data: data:
- file: lib/d8.jar - file: lib/d8.jar
\ No newline at end of file
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