Commit 7e123405 authored by Mohamed Heikal's avatar Mohamed Heikal Committed by Commit Bot

Roll R8 to 1d0cad3ec27fc88a

Roll R8 to ToT in order to include latest fix for removing generated
extensions references for extensions that are not in the dex.

Bug: 1147185
Change-Id: I744e76fe2a34396f4f98ac9d72b34f558c9a10d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542367Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828217}
parent 921d7ed3
...@@ -1377,7 +1377,7 @@ deps = { ...@@ -1377,7 +1377,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/r8', 'package': 'chromium/third_party/r8',
'version': 'jIJhJ4I22Dx5V-URd7bp-x1RILv5vrLEJdjjt77MRPcC', 'version': 'GXNupZ4wd3_EsDohjcNOss3iuVb5gcv0rAeHUiH05JkC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
...@@ -358,7 +358,8 @@ def _OptimizeWithR8(options, ...@@ -358,7 +358,8 @@ def _OptimizeWithR8(options,
def _CheckForMissingSymbols(r8_path, dex_files, classpath, warnings_as_errors): def _CheckForMissingSymbols(r8_path, dex_files, classpath, warnings_as_errors):
cmd = build_utils.JavaCmd(warnings_as_errors) + [ cmd = build_utils.JavaCmd(warnings_as_errors) + [
'-cp', r8_path, 'com.android.tools.r8.tracereferences.TraceReferences', '-cp', r8_path, 'com.android.tools.r8.tracereferences.TraceReferences',
'--map-diagnostics:MissingDefinitionsDiagnostic', 'error', 'warning' '--map-diagnostics:MissingDefinitionsDiagnostic', 'error', 'warning',
'--check'
] ]
for path in classpath: for path in classpath:
......
Name: R8 Name: R8
URL: https://r8.googlesource.com/r8 URL: https://r8.googlesource.com/r8
Revision: dfeb0e3200aa737742fa1d72e64505c44b3a5f3c Revision: 1d0cad3ec27fc88a1ca4ffc4d3d4d5d0b3f80f5b
Version: Unknown Version: Unknown
License: BSD 3-Clause License: BSD 3-Clause
License File: NOT_SHIPPED License File: NOT_SHIPPED
...@@ -53,6 +53,7 @@ cd $CHROMIUM_SRC/third_party/r8 ...@@ -53,6 +53,7 @@ cd $CHROMIUM_SRC/third_party/r8
cipd create --pkg-def cipd.yaml # Make note of the instance ID cipd create --pkg-def cipd.yaml # Make note of the instance ID
# Update backported methods list: # Update backported methods list:
cd $CHROMIUM_SRC
java -cp third_party/r8/lib/r8.jar com.android.tools.r8.BackportedMethodList --min-api 16 > third_party/r8/backported_methods.txt java -cp third_party/r8/lib/r8.jar com.android.tools.r8.BackportedMethodList --min-api 16 > third_party/r8/backported_methods.txt
# Manually update: # Manually update:
......
From 6c4560832fd411b70669b2dfcb14bbff98524256 Mon Sep 17 00:00:00 2001 From 43c8250f2420c41640305d68b9d4512d69b850b0 Mon Sep 17 00:00:00 2001
From: Sam Maier <smaier@chromium.org> From: Sam Maier <smaier@chromium.org>
Date: Tue, 19 May 2020 15:55:44 -0400 Date: Tue, 19 May 2020 15:55:44 -0400
Subject: [PATCH 1/3] Desugaring: Make all lambdas stateless & fix naming Subject: [PATCH 1/3] Desugaring: Make all lambdas stateless & fix naming
...@@ -35,5 +35,5 @@ index c9e47c259..b5b72c0ab 100644 ...@@ -35,5 +35,5 @@ index c9e47c259..b5b72c0ab 100644
void addSynthesizedFrom(DexProgramClass clazz) { void addSynthesizedFrom(DexProgramClass clazz) {
-- --
2.29.0.rc1.297.gfa9743e501-goog 2.29.2.299.gdc1121823c-goog
From febbe4508395a83f64e6f5e3cd55052fc8e16e8c Mon Sep 17 00:00:00 2001 From 81210f660e8b86116e7b512ae25c44c44cb1e1e7 Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org> From: Andrew Grieve <agrieve@chromium.org>
Date: Mon, 28 Sep 2020 15:51:32 -0400 Date: Mon, 28 Sep 2020 15:51:32 -0400
Subject: [PATCH 2/3] Command-line flags for class merging and outlining Subject: [PATCH 2/3] Command-line flags for class merging and outlining
...@@ -8,23 +8,25 @@ Subject: [PATCH 2/3] Command-line flags for class merging and outlining ...@@ -8,23 +8,25 @@ Subject: [PATCH 2/3] Command-line flags for class merging and outlining
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
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 ea902d508..708961316 100644 index 47c084e22..a7b1fc0eb 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
@@ -234,9 +234,9 @@ public class InternalOptions implements GlobalKeepInfoConfiguration { @@ -236,11 +236,11 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
public boolean enableFieldAssignmentTracker = true; public boolean enableFieldAssignmentTracker = true;
public boolean enableFieldBitAccessAnalysis = public boolean enableFieldBitAccessAnalysis =
System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null; System.getProperty("com.android.tools.r8.fieldBitAccessAnalysis") != null;
- public boolean enableStaticClassMerging = true; - public boolean enableStaticClassMerging = true;
- public boolean enableHorizontalClassMerging = true; - public boolean enableHorizontalClassMerging = true;
- public boolean enableVerticalClassMerging = true;
+ public boolean enableStaticClassMerging = System.getProperty("com.android.tools.r8.staticClassMerging") != null; + public boolean enableStaticClassMerging = System.getProperty("com.android.tools.r8.staticClassMerging") != null;
+ public boolean enableHorizontalClassMerging = System.getProperty("com.android.tools.r8.horizontalClassMerging") != null; + public boolean enableHorizontalClassMerging = System.getProperty("com.android.tools.r8.horizontalClassMerging") != null;
public int horizontalClassMergingMaxGroupSize = 30;
public boolean enableHorizontalClassMergingOfKotlinLambdas = true;
- public boolean enableVerticalClassMerging = true;
+ public boolean enableVerticalClassMerging = System.getProperty("com.android.tools.r8.verticalClassMerging") != null; + public boolean enableVerticalClassMerging = System.getProperty("com.android.tools.r8.verticalClassMerging") != null;
public boolean enableArgumentRemoval = true; public boolean enableArgumentRemoval = true;
public boolean enableUnusedInterfaceRemoval = true; public boolean enableUnusedInterfaceRemoval = true;
public boolean enableDevirtualization = true; public boolean enableDevirtualization = true;
@@ -1146,7 +1146,7 @@ public class InternalOptions implements GlobalKeepInfoConfiguration { @@ -1167,7 +1167,7 @@ public class InternalOptions implements GlobalKeepInfoConfiguration {
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";
...@@ -34,5 +36,5 @@ index ea902d508..708961316 100644 ...@@ -34,5 +36,5 @@ index ea902d508..708961316 100644
public int maxSize = 99; public int maxSize = 99;
public int threshold = 20; public int threshold = 20;
-- --
2.29.0.rc1.297.gfa9743e501-goog 2.29.2.299.gdc1121823c-goog
From cac4f22114d62108152db25745a241e84157b2a6 Mon Sep 17 00:00:00 2001 From eaf26704d9d5143d3cd5a8aa96ebff225bdf6747 Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org> From: Andrew Grieve <agrieve@chromium.org>
Date: Wed, 21 Oct 2020 10:59:42 -0400 Date: Wed, 21 Oct 2020 10:59:42 -0400
Subject: [PATCH 3/3] Allow access modification everywhere Subject: [PATCH 3/3] Allow access modification everywhere
...@@ -11,10 +11,10 @@ than adding ",allowaccessmodification" to every single -keep rule. ...@@ -11,10 +11,10 @@ than adding ",allowaccessmodification" to every single -keep rule.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java diff --git a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
index b54a0db2d..e02a41ce0 100644 index bdda13be7..7553cbfa6 100644
--- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java --- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
+++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java +++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
@@ -917,7 +917,7 @@ public class AppInfoWithLiveness extends AppInfoWithClassHierarchy @@ -881,7 +881,7 @@ public class AppInfoWithLiveness extends AppInfoWithClassHierarchy
public boolean isAccessModificationAllowed(DexReference reference) { public boolean isAccessModificationAllowed(DexReference reference) {
assert options().getProguardConfiguration().isAccessModificationAllowed(); assert options().getProguardConfiguration().isAccessModificationAllowed();
...@@ -24,5 +24,5 @@ index b54a0db2d..e02a41ce0 100644 ...@@ -24,5 +24,5 @@ index b54a0db2d..e02a41ce0 100644
public boolean isRepackagingAllowed(DexProgramClass clazz) { public boolean isRepackagingAllowed(DexProgramClass clazz) {
-- --
2.29.0.rc1.297.gfa9743e501-goog 2.29.2.299.gdc1121823c-goog
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