diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-04 17:20:24 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-12 08:15:25 +0000 |
commit | 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch) | |
tree | 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/third_party/r8 | |
parent | 606d85f2a5386472314d39923da28c70c60dc8e7 (diff) | |
download | qtwebengine-chromium-8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b.tar.gz |
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/r8')
6 files changed, 23 insertions, 41 deletions
diff --git a/chromium/third_party/r8/3pp/patches/0001-Statefull-lambdas-regress-dex-size.patch b/chromium/third_party/r8/3pp/patches/0001-Statefull-lambdas-regress-dex-size.patch index 32ed2a60097..f3ffc4c01f4 100644 --- a/chromium/third_party/r8/3pp/patches/0001-Statefull-lambdas-regress-dex-size.patch +++ b/chromium/third_party/r8/3pp/patches/0001-Statefull-lambdas-regress-dex-size.patch @@ -1,7 +1,9 @@ -From 60780034d9ef3d627b16725c197403a5fe1b6a27 Mon Sep 17 00:00:00 2001 +From aa77ad9451ff07f8edf8d38a8b0064f24fec5da8 Mon Sep 17 00:00:00 2001 From: Andrew Grieve <agrieve@chromium.org> Date: Mon, 1 Feb 2021 15:09:52 -0500 -Subject: [PATCH 1/4] Statefull lambdas regress dex size. +Subject: [PATCH 1/3] Statefull lambdas regress dex size. + +Nov 1, 2021 Monochrome.apk: Saved 21kb, 823 fields, 27 methods. Bug: b/129997269 --- @@ -9,10 +11,10 @@ Bug: b/129997269 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java -index 3b5a40b65..ddb1d7955 100644 +index cd175656a..96f7c93f6 100644 --- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java +++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java -@@ -145,7 +145,8 @@ public final class LambdaClass { +@@ -146,7 +146,8 @@ public final class LambdaClass { } public final boolean isStateless() { @@ -23,5 +25,5 @@ index 3b5a40b65..ddb1d7955 100644 // Synthesize virtual methods. -- -2.32.0.288.g62a8d224e6-goog +2.33.0.882.g93a45727a2-goog diff --git a/chromium/third_party/r8/3pp/patches/0002-Allow-access-modification-everywhere.patch b/chromium/third_party/r8/3pp/patches/0002-Allow-access-modification-everywhere.patch deleted file mode 100644 index 0dd13d5aa5a..00000000000 --- a/chromium/third_party/r8/3pp/patches/0002-Allow-access-modification-everywhere.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4ab201427d83f47fda9dba7b6ef79b9cef6d7c2c Mon Sep 17 00:00:00 2001 -From: Andrew Grieve <agrieve@chromium.org> -Date: Wed, 21 Oct 2020 10:59:42 -0400 -Subject: [PATCH 2/4] Allow access modification everywhere - -Chrome does not need need -keep to maintain original visibility. -Loosening this constraint allows for better optimization, and is easier -than adding ",allowaccessmodification" to every single -keep rule. ---- - .../java/com/android/tools/r8/shaking/AppInfoWithLiveness.java | 2 +- - 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 -index 2ff90085c..0e0acd581 100644 ---- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java -+++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java -@@ -953,7 +953,7 @@ public class AppInfoWithLiveness extends AppInfoWithClassHierarchy - - public boolean isAccessModificationAllowed(DexReference reference) { - assert options().getProguardConfiguration().isAccessModificationAllowed(); -- return keepInfo.getInfo(reference, this).isAccessModificationAllowed(options()); -+ return true; - } - - public boolean isRepackagingAllowed(DexProgramClass clazz) { --- -2.32.0.288.g62a8d224e6-goog - diff --git a/chromium/third_party/r8/3pp/patches/0003-Add-disassemble-command-to-keeps.patch b/chromium/third_party/r8/3pp/patches/0003-Add-disassemble-command-to-keeps.patch index aec0a9e0d86..c8cd0126ec4 100644 --- a/chromium/third_party/r8/3pp/patches/0003-Add-disassemble-command-to-keeps.patch +++ b/chromium/third_party/r8/3pp/patches/0003-Add-disassemble-command-to-keeps.patch @@ -1,7 +1,7 @@ -From bc79e6d9c90e8586d841ddf9cdfaaf591c33996d Mon Sep 17 00:00:00 2001 +From a46ecfad6b70f941c0817c24a03598624bde17e6 Mon Sep 17 00:00:00 2001 From: Mohamed Heikal <mheikal@google.com> Date: Wed, 26 May 2021 19:03:39 -0400 -Subject: [PATCH 3/4] Add disassemble command to keeps +Subject: [PATCH 3/3] Add disassemble command to keeps --- src/main/keep.txt | 1 + @@ -20,5 +20,5 @@ index e03ef61f8..5454561a4 100644 -keep public class com.android.tools.r8.dexsplitter.DexSplitter { public static void main(java.lang.String[]); } -- -2.32.0.288.g62a8d224e6-goog +2.33.0.882.g93a45727a2-goog diff --git a/chromium/third_party/r8/OWNERS b/chromium/third_party/r8/OWNERS index cb00e5e1618..1f0b8ed0ef7 100644 --- a/chromium/third_party/r8/OWNERS +++ b/chromium/third_party/r8/OWNERS @@ -1,3 +1,4 @@ smaier@chromium.org agrieve@chromium.org wnwen@chromium.org +mheikal@chromium.org diff --git a/chromium/third_party/r8/README.chromium b/chromium/third_party/r8/README.chromium index 477ca999981..f11f73e049a 100644 --- a/chromium/third_party/r8/README.chromium +++ b/chromium/third_party/r8/README.chromium @@ -30,6 +30,8 @@ Local Modifications: desugared version accesses the "dark greylisted" SynchronizedCollection.mutex field, which caused modal dialogs to appear on Android P instrumentation tests. https://crbug.com/1256614 + * Removed references to ThreadLocalRandom to avoid streams APIs being pulled + in unnecessarily. https://crbug.com/1280841 * Added "java/src/org/chromium/build/CustomD8.java", custom_d8.jar, and BUILD.gn. * Used in "build/android/gyp/dex.py" to enable desugar dependencies. @@ -55,8 +57,9 @@ cp out/Debug/obj/third_party/r8/custom_d8_java.javac.jar third_party/r8/custom_d * The bot autoruns every 6 hours. Ping a trooper or a clank build core dev to trigger it if you need it sooner: https://luci-scheduler.appspot.com/jobs/chromium/3pp-linux-amd64-packager - * The autoroller runs automatically when a new cipd instance is uploaded, see - its status here: https://autoroll.skia.org/r/r8-chromium + * The autoroller runs automatically when a new cipd instance is uploaded. + * Since r8 rolls affect downstream, the roller is only accessible to Googlers. + * See its status here: https://skia-autoroll.corp.goog/r/r8-chromium * If patching fails: git clone https://r8.googlesource.com/r8 @@ -89,7 +92,13 @@ java -cp third_party/r8/lib/r8.jar com.android.tools.r8.BackportedMethodList --m * Update instructions for desugar_jdk_libs.json: unzip -p third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/*.jar META-INF/desugar/d8/desugar.json > third_party/r8/desugar_jdk_libs.json - * Remove all mentions of ConcurrentHashMap and TimeZone#getTimeZone and remove trailing commas. + * Remove all mentions of: + * ConcurrentHashMap + * TimeZone#getTimeZone + * Collections#synchronizedMap + * Collections#synchronizedSortedMap + * ThreadLocalRandom + * Don't forget to remove trailing commas where applicable. * Update //build/config/android/internal_rules.gni to point at the new .jar files: * desugar_jdk_libs-1.1.1.jar * desugar_jdk_libs_configuration-1.1.1.jar diff --git a/chromium/third_party/r8/desugar_jdk_libs.json b/chromium/third_party/r8/desugar_jdk_libs.json index 040d18dde43..c2cdcb028bc 100644 --- a/chromium/third_party/r8/desugar_jdk_libs.json +++ b/chromium/third_party/r8/desugar_jdk_libs.json @@ -118,7 +118,6 @@ "java.util.StringJoiner": "j$.util.StringJoiner", "java.util.Tripwire": "j$.util.Tripwire", "java.util.concurrent.DesugarUnsafe": "j$.util.concurrent.DesugarUnsafe", - "java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom", "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic" }, "retarget_lib_member": { @@ -188,7 +187,6 @@ "java.util.PrimitiveIterator": "j$.util.PrimitiveIterator", "java.util.Spliterator": "j$.util.Spliterator", "java.util.StringJoiner": "j$.util.StringJoiner", - "java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom", "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic" }, "retarget_lib_member": { |