Skip to content

Commit

Permalink
Update Chromium Webview to 130.0.6723.73
Browse files Browse the repository at this point in the history
Change-Id: Ibb19939dcce81f49477ad707a28c36eb2dd3459f
  • Loading branch information
haggertk committed Oct 23, 2024
1 parent 4b12947 commit 9108113
Show file tree
Hide file tree
Showing 12 changed files with 328 additions and 240 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 86f3c5b71275ee465c82e8d481a21bba57dc6c75 Mon Sep 17 00:00:00 2001
From 53d180517c51ff50b6cd192da1d4486e9f41e7e4 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Thu, 18 May 2017 11:04:40 +0200
Subject: [PATCH 01/11] Add support for getting updates for theme color
Expand Down Expand Up @@ -211,5 +211,5 @@ index be8f554e3930e..7e2e11de7b3db 100644
public WebResourceResponseInfo shouldInterceptRequest(
AwContentsClient.AwWebResourceRequest request) {
--
2.46.1
2.47.0

4 changes: 2 additions & 2 deletions 0002-Add-xxxhdpi-icon_webview.png-to-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d00c57c89ed143f3ec2a81e365e8e5859b4492c4 Mon Sep 17 00:00:00 2001
From bc664b537c3cde54a0da7894b885a659e148bc48 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Tue, 19 May 2020 17:21:42 -0600
Subject: [PATCH 02/11] Add xxxhdpi icon_webview.png to BUILD.gn
Expand All @@ -20,5 +20,5 @@ index 7f710b1747102..cc28b07a0f33e 100644
}

--
2.46.1
2.47.0

8 changes: 4 additions & 4 deletions 0003-webview-Hard-no-to-persistent-histograms.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f454457e8f42bd2ceb6355d4a70bd5d19e4d4fa3 Mon Sep 17 00:00:00 2001
From eab015e269aca5808c52506074a3bad48769c3f6 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Sun, 27 Dec 2020 09:42:54 -0700
Subject: [PATCH 03/11] webview: Hard no to persistent histograms
Expand All @@ -15,7 +15,7 @@ Subject: [PATCH 03/11] webview: Hard no to persistent histograms
1 file changed, 2 insertions(+)

diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc
index 7d3e926804d81..2dd8f2e9b6b8f 100644
index 01506b9623043..220c14b41d844 100644
--- a/android_webview/browser/aw_field_trials.cc
+++ b/android_webview/browser/aw_field_trials.cc
@@ -91,6 +91,7 @@ class AwFeatureOverrides {
Expand All @@ -28,12 +28,12 @@ index 7d3e926804d81..2dd8f2e9b6b8f 100644
if (base::PathService::Get(base::DIR_ANDROID_APP_DATA, &metrics_dir)) {
@@ -98,6 +99,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
} else {
NOTREACHED_IN_MIGRATION();
NOTREACHED();
}
+#endif
}

// TODO(crbug.com/40271903): Consider to migrate all WebView feature overrides
--
2.46.1
2.47.0

8 changes: 4 additions & 4 deletions 0004-disable-autofill-server-communication-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 97d162e1633eaa875facaa4bac01c9d786f59915 Mon Sep 17 00:00:00 2001
From f5edf184d496cb5ee7c0705848bbc8f074ed3c57 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 1 Dec 2020 00:56:57 -0500
Subject: [PATCH 04/11] disable autofill server communication by default
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH 04/11] disable autofill server communication by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
index bb9121b172455..1511e0e3467dd 100644
index d84b4ee51c503..905929cdf5ee1 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -985,7 +985,7 @@ const base::FeatureParam<std::string>
@@ -871,7 +871,7 @@ const base::FeatureParam<std::string>
// i.e., https://other.autofill.server:port/tbproxy/af/
BASE_FEATURE(kAutofillServerCommunication,
"AutofillServerCommunication",
Expand All @@ -21,5 +21,5 @@ index bb9121b172455..1511e0e3467dd 100644
// Controls attaching the autofill type predictions to their respective
// element in the DOM.
--
2.46.1
2.47.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8222b45977e8ebfe197f58dc45af06ee68e3162f Mon Sep 17 00:00:00 2001
From 0728acebc118cbb7573f0c6a6cd9249d0b3ad659 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Tue, 28 Sep 2021 08:43:01 -0600
Subject: [PATCH 05/11] webview: Disable autofill metadata uploads by default
Expand All @@ -23,5 +23,5 @@ index 201ecfe1eaa3b..f49a7bc22e8ae 100644
}

--
2.46.1
2.47.0

12 changes: 6 additions & 6 deletions 0006-disable-WebView-variations-support.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7ede8db8c742cac10924e3af2ea4f63411b12f98 Mon Sep 17 00:00:00 2001
From aeb310a84499714bb172d13d73a976920a628eb4 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 10 Dec 2020 10:09:18 -0500
Subject: [PATCH 06/11] disable WebView variations support
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH 06/11] disable WebView variations support
2 files changed, 10 deletions(-)

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
index f8fca3ff457ee..9e2191c8560d0 100644
index 9df9ef610213e..561b1a3dab4aa 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
@@ -248,12 +248,6 @@ public class WebViewChromiumAwInit {
@@ -244,12 +244,6 @@ public class WebViewChromiumAwInit {

AwBrowserProcess.configureChildProcessLauncher();

Expand All @@ -26,10 +26,10 @@ index f8fca3ff457ee..9e2191c8560d0 100644

// TODO(crbug.com/332706093): See if this can be moved before loading native.
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 7ed3bff2cb0e9..d55667f684111 100644
index 19e48c392e3a8..f6dcb9545c067 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -528,10 +528,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
@@ -521,10 +521,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
}

Expand All @@ -41,5 +41,5 @@ index 7ed3bff2cb0e9..d55667f684111 100644

setSingleton(this);
--
2.46.1
2.47.0

4 changes: 2 additions & 2 deletions 0007-disable-component-updater-pings-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ea27c5593e0a488f3fec35912cad345d7391d982 Mon Sep 17 00:00:00 2001
From b24d6e2613f498c80694f5ef8656bdd4c72f5099 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Fri, 27 Nov 2020 03:56:29 -0500
Subject: [PATCH 07/11] disable component updater pings by default
Expand All @@ -21,5 +21,5 @@ index 6c16b4e37a753..a627cb7ffd59c 100644

// If non-zero, time interval until the first component update check.
--
2.46.1
2.47.0

62 changes: 31 additions & 31 deletions 0008-Revert-Allow-uses-library-android.ext.adservices.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 970b0de43f25edc42435eb81b66ff5ba5dd8d9e3 Mon Sep 17 00:00:00 2001
From fe09be5b1351da34ec433ef82e638bfea1b53272 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Sat, 2 Mar 2024 08:55:45 -0700
Subject: [PATCH 08/11] Revert "Allow uses-library android.ext.adservices"
Expand All @@ -25,10 +25,10 @@ This reverts commit 0c3ae92dd16b763625a4d8c3f05012d9813dee2d.
create mode 100644 third_party/androidx/0_privacysandbox_AndroidManifest.xml

diff --git a/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected
index db71bbe82ef6d..9939dc472659a 100644
index cd63b2e54b235..103f5670adb80 100644
--- a/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected
@@ -508,7 +508,6 @@
@@ -509,7 +509,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -37,10 +37,10 @@ index db71bbe82ef6d..9939dc472659a 100644
</application>
</manifest>
diff --git a/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected
index 99da3f0c68efe..a07878fa0631a 100644
index ede5cd89ac4bb..8f0864200094e 100644
--- a/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
@@ -508,7 +508,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -49,10 +49,10 @@ index 99da3f0c68efe..a07878fa0631a 100644
</application>
</manifest>
diff --git a/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected
index bb7656558f7b8..1ddc946a23c91 100644
index 62af29cddc3aa..022a45628ae4c 100644
--- a/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
@@ -508,7 +508,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -61,21 +61,21 @@ index bb7656558f7b8..1ddc946a23c91 100644
</application>
</manifest>
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
index 6d36a6755bfde..63d1d32ef65ac 100644
index a911dc1acef13..2efcdc11a2c62 100644
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -494,6 +494,5 @@
@@ -495,6 +495,5 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
- <uses-library android:name="android.ext.adservices" android:required="false"/>
</application>
</manifest>
diff --git a/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected
index f72bf06cacb0c..eb843b0df2fe1 100644
index 72acf6c6cf885..2051ebb0cde96 100644
--- a/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected
@@ -508,7 +508,6 @@
@@ -509,7 +509,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -84,10 +84,10 @@ index f72bf06cacb0c..eb843b0df2fe1 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=31"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected
index 826cd507b036f..b9f4abad62e73 100644
index 73858c07327de..9582caae1d368 100644
--- a/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
@@ -508,7 +508,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -96,10 +96,10 @@ index 826cd507b036f..b9f4abad62e73 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=30"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected
index 9fbc8e4df3da1..9e5a9d5b6c4f0 100644
index 8d14e8b72df38..3687a8e75f654 100644
--- a/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
@@ -508,7 +508,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -108,10 +108,10 @@ index 9fbc8e4df3da1..9e5a9d5b6c4f0 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=33"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected
index b4cf095753986..6e812228d4831 100644
index 4c483580a9a40..6043ec7250c52 100644
--- a/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
@@ -508,7 +508,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -120,10 +120,10 @@ index b4cf095753986..6e812228d4831 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=34"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected
index d14d137d67022..3c236904b28cd 100644
index 7a2f69cd394bd..fa04a2f98e392 100644
--- a/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_bundle.AndroidManifest.expected
@@ -494,7 +494,6 @@
@@ -495,7 +495,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -132,10 +132,10 @@ index d14d137d67022..3c236904b28cd 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected
index daa1573ddbaf4..08780e53843da 100644
index 5f34c5f8bf629..d739ce3e974d5 100644
--- a/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected
@@ -768,7 +768,6 @@
@@ -762,7 +762,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -144,10 +144,10 @@ index daa1573ddbaf4..08780e53843da 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
index 0925d8cae98d7..b67cf13c0027c 100644
index dc5fb5ff28c91..10d9b7b6fdddb 100644
--- a/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
@@ -767,7 +767,6 @@
@@ -761,7 +761,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -156,10 +156,10 @@ index 0925d8cae98d7..b67cf13c0027c 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected
index 13be62ae945b8..eda5b1a0fa6b3 100644
index 3e935ca58117b..c2d154c2f3d77 100644
--- a/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected
@@ -767,7 +767,6 @@
@@ -761,7 +761,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -168,10 +168,10 @@ index 13be62ae945b8..eda5b1a0fa6b3 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
index 3c8d943d72b48..b62030e7dfb9f 100644
index d9c62534eae27..e2d4a4e81050f 100644
--- a/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
@@ -767,7 +767,6 @@
@@ -761,7 +761,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -180,10 +180,10 @@ index 3c8d943d72b48..b62030e7dfb9f 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected
index 7ee75fd9dca82..87acc29c7b08c 100644
index f92eb5440458f..6776182bc3ee7 100644
--- a/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected
@@ -737,6 +737,5 @@
@@ -731,6 +731,5 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand Down Expand Up @@ -216,7 +216,7 @@ index 0000000000000..da6c78ff7b0cc
+ </application>
+</manifest>
diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/customizations.gni
index 3d8b559964824..c97b0c3115e3b 100644
index 1574c3aa57496..a181dde8426ed 100644
--- a/third_party/androidx/customizations.gni
+++ b/third_party/androidx/customizations.gni
@@ -65,6 +65,12 @@ template("_androidx_prebuilt") {
Expand All @@ -233,5 +233,5 @@ index 3d8b559964824..c97b0c3115e3b 100644
# Keeps emoji2 code. See http://crbug.com/1205141
ignore_proguard_configs = true
--
2.46.1
2.47.0

Loading

0 comments on commit 9108113

Please sign in to comment.