Skip to content

Commit 17dcc64

Browse files
quh4gko8thestinger
authored andcommitted
Update/port patches for 134.0.6998.95.0
1 parent 78dfc9f commit 17dcc64

8 files changed

+103
-70
lines changed

patches/0001-Vanadium-string-rebranding.patch

+92-39
Large diffs are not rendered by default.

patches/0012-Checkout-PGO-profiles.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/DEPS b/DEPS
11-
index 846076ad1ca1c..e046f03a9b3cc 100644
11+
index 570ca5d73de14..f301621696e3c 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -149,7 +149,7 @@ vars = {

patches/0013-disable-checkout_nacl.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/DEPS b/DEPS
11-
index e046f03a9b3cc..6971b2bc1ca92 100644
11+
index f301621696e3c..df1bef0467317 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -114,7 +114,7 @@ vars = {

patches/0073-enable-strict-site-isolation-by-default-on-Android.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] enable strict site isolation by default on Android
99
2 files changed, 14 deletions(-)
1010

1111
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
12-
index 71b8c74866b4f..4e60c78ef46fe 100644
12+
index 3f39aa632c6fa..9b995e7d9ac60 100644
1313
--- a/chrome/browser/about_flags.cc
1414
+++ b/chrome/browser/about_flags.cc
15-
@@ -5215,16 +5215,6 @@ const FeatureEntry kFeatureEntries[] = {
15+
@@ -5217,16 +5217,6 @@ const FeatureEntry kFeatureEntries[] = {
1616
kOsCrOS | kOsLinux | kOsAndroid,
1717
FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)},
1818
#endif

patches/0137-config-add-new-needed-deps-to-fetch-filter-lists.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ for adblocking.
1010
1 file changed, 11 insertions(+)
1111

1212
diff --git a/DEPS b/DEPS
13-
index 6971b2bc1ca92..5ad0256475fc2 100644
13+
index df1bef0467317..94816cbe05168 100644
1414
--- a/DEPS
1515
+++ b/DEPS
1616
@@ -5610,6 +5610,17 @@ hooks = [

patches/0175-add-support-for-german-specific-language-content-fil.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Subject: [PATCH] add support for german-specific language content filtering
1212
4 files changed, 26 insertions(+)
1313

1414
diff --git a/DEPS b/DEPS
15-
index 5ad0256475fc2..17227d55692eb 100644
15+
index 94816cbe05168..a90d4f68b5c45 100644
1616
--- a/DEPS
1717
+++ b/DEPS
1818
@@ -5621,6 +5621,16 @@ hooks = [

patches/0203-Support-for-excluding-crashpad-in-compiling-chrome-t.patch

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Subject: [PATCH] Support for excluding crashpad in compiling chrome targets
66
---
77
chrome/android/chrome_ext_args.gni | 1 +
88
chrome/android/chrome_public_apk_tmpl.gni | 4 ++++
9-
chrome/android/trichrome.gni | 4 ++++
10-
3 files changed, 9 insertions(+)
9+
chrome/android/trichrome.gni | 5 +++++
10+
3 files changed, 10 insertions(+)
1111

1212
diff --git a/chrome/android/chrome_ext_args.gni b/chrome/android/chrome_ext_args.gni
1313
index 4c76245f15f45..34ce37bea69b4 100644
@@ -42,7 +42,7 @@ index 4fe4f115bce1b..df10263fea424 100644
4242
deps +=
4343
[ "//components/crash/core/app:chrome_crashpad_handler_named_as_so" ]
4444
diff --git a/chrome/android/trichrome.gni b/chrome/android/trichrome.gni
45-
index 65c97d56a00df..fefc42a71aed7 100644
45+
index 65c97d56a00df..30342f2c4ddc0 100644
4646
--- a/chrome/android/trichrome.gni
4747
+++ b/chrome/android/trichrome.gni
4848
@@ -6,6 +6,7 @@ import("//build/config/android/abi.gni")
@@ -53,11 +53,12 @@ index 65c97d56a00df..fefc42a71aed7 100644
5353
import("//chrome/android/modules/buildflags.gni")
5454
import("//chrome/version.gni")
5555
import("//device/vr/buildflags/buildflags.gni")
56-
@@ -155,6 +156,9 @@ template("trichrome_library_apk_tmpl") {
56+
@@ -155,6 +156,10 @@ template("trichrome_library_apk_tmpl") {
5757
# https://chromium.googlesource.com/chromium/src/+/main/docs/android_native_libraries.md#Crashpad-Packaging
5858
loadable_modules = []
5959
secondary_abi_loadable_modules = []
6060
+ if (!include_crashpad) {
61+
+ not_needed([ "_secondary_out_dir" ])
6162
+ # Empty loadable module for now until stub crashpad shared object is needed.
6263
+ } else
6364
if (_include_primary_abi) {

patches/0204-fix-configuration-error.patch

-21
This file was deleted.

0 commit comments

Comments
 (0)