Skip to content

Commit 7839005

Browse files
quh4gko8thestinger
authored andcommitted
Update/port patches for 134.0.6998.108.0
1 parent a9f6835 commit 7839005

8 files changed

+72
-29
lines changed

patches/0001-Vanadium-string-rebranding.patch

+23-23
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 570ca5d73de14..f301621696e3c 100644
11+
index 3c193add6b532..7588b647eff79 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 f301621696e3c..df1bef0467317 100644
11+
index 7588b647eff79..8125903a0bb2d 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -114,7 +114,7 @@ vars = {

patches/0017-disable-WebView-variations-support.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] disable WebView variations support
99
2 files changed, 10 deletions(-)
1010

1111
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
12-
index 2a21937734f5d..e261fa0fe615c 100644
12+
index ccbaf189d379a..92a225cc7d966 100644
1313
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
1414
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
1515
@@ -349,12 +349,6 @@ public class WebViewChromiumAwInit {

patches/0018-disable-Media-Integrity-blink-extension-API-on-webvi.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] disable Media Integrity blink extension API on webview by
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
12-
index 8adb77e1b8c49..35a6bf3294c0c 100644
12+
index 910bfd8552f4e..1f2b023f6dac4 100644
1313
--- a/android_webview/common/aw_features.cc
1414
+++ b/android_webview/common/aw_features.cc
1515
@@ -72,7 +72,7 @@ BASE_FEATURE(kWebViewLazyFetchHandWritingIcon,

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 df1bef0467317..94816cbe05168 100644
13+
index 8125903a0bb2d..30e3742ff09d3 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 94816cbe05168..a90d4f68b5c45 100644
15+
index 30e3742ff09d3..f0dad1dc5869b 100644
1616
--- a/DEPS
1717
+++ b/DEPS
1818
@@ -5621,6 +5621,16 @@ hooks = [
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: fgei <fgei@gmail.com>
3+
Date: Tue, 18 Mar 2025 15:43:00 +0000
4+
Subject: [PATCH] tmp: Disable functionalities dependent on Play services
5+
dynamite features
6+
7+
---
8+
.../shape_detection/BarcodeDetectionProviderImpl.java | 5 +++++
9+
.../src/org/chromium/shape_detection/TextDetectionImpl.java | 5 +++++
10+
2 files changed, 10 insertions(+)
11+
12+
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java
13+
index bfa0c88679ff9..b806009bd0ebd 100644
14+
--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java
15+
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java
16+
@@ -69,6 +69,11 @@ public class BarcodeDetectionProviderImpl implements BarcodeDetectionProvider {
17+
Log.w(TAG, "Google Play Services not available");
18+
return null;
19+
}
20+
+ boolean shouldAlwaysDisable = true;
21+
+ if (shouldAlwaysDisable) {
22+
+ Log.i(TAG, "Barcode detection always disabled");
23+
+ return null;
24+
+ }
25+
int version =
26+
PackageUtils.getPackageVersion(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE);
27+
if (version < 19742000) {
28+
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java
29+
index 4e2a322b8df31..7bb65eb5ee002 100644
30+
--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java
31+
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java
32+
@@ -93,6 +93,11 @@ public class TextDetectionImpl implements TextDetection {
33+
Log.e(TAG, "Google Play Services not available");
34+
return null;
35+
}
36+
+ boolean shouldAlwaysDisable = true;
37+
+ if (shouldAlwaysDisable) {
38+
+ Log.i(TAG, "Text detection always disabled");
39+
+ return null;
40+
+ }
41+
return new TextDetectionImpl();
42+
}
43+
}

0 commit comments

Comments
 (0)