PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

no changes to the code, just changes to the context

Browse Source
This commit is contained in:
Carmelo Messina
2026-04-15 17:40:51 +02:00
parent 0287d87391
commit 880346893d
4 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Android-fonts-fingerprinting-mitigation.patch
+1 -1
View File
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7869,6 +7869,13 @@ static_library("browser") {
@@ -7866,6 +7866,13 @@ static_library("browser") {
]
}
build/patches/Enable-menu-on-reload-button.patch
+1 -1
View File
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4899,10 +4899,10 @@ are declared in tools/grit/grit_args.gni.
@@ -4894,10 +4894,10 @@ are declared in tools/grit/grit_args.gni.
Normal Reload
</message>
<message name="IDS_RELOAD_MENU_HARD_RELOAD_ITEM" desc="Menu item displayed in the Reload dropdown menu when in dev mode">
build/patches/eyeo-133.0.6943.49-android_api.patch
+1 -18
View File
@@ -11,7 +11,6 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module
.../browser/adblock/TabIdTranslator.java | 36 ++
chrome/browser/BUILD.gn | 4 +
.../android/adblock/tab_id_translator_jni.cc | 43 ++
chrome/browser/ui/BUILD.gn | 6 +
components/adblock/android/BUILD.gn | 107 +++++
.../adblock/android/adblock_controller_jni.cc | 133 ++++++
.../filtering_configuration_android.cc | 246 ++++++++++
@@ -24,7 +23,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module
.../adblock/ResourceFilteringCounters.java | 111 +++++
...esource_classification_notifier_android.cc | 166 +++++++
...resource_classification_notifier_android.h | 72 +++
18 files changed, 2057 insertions(+)
17 files changed, 2051 insertions(+)
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/adblock/TabIdTranslator.java
create mode 100644 chrome/browser/android/adblock/tab_id_translator_jni.cc
create mode 100644 components/adblock/android/BUILD.gn
@@ -214,22 +213,6 @@ new file mode 100644
+}
+
+DEFINE_JNI(TabIdTranslator)
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1076,6 +1076,12 @@ static_library("ui") {
deps += [
"//components/themes:ntp_background_proto",
]
+ ### Android API module start
+ deps += [
+ "//components/adblock/android:java_bindings",
+ "//components/adblock/android:jni_headers",
+ ]
+ ### Android API module end
} else {
# !is_android
sources += [
diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BUILD.gn
new file mode 100644
--- /dev/null
build/patches/eyeo-133.0.6943.49-chrome_integration.patch
+18 -5
View File
@@ -17,12 +17,12 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module
.../prefs/chrome_pref_service_factory.cc | 11 +++++++
...hrome_browser_main_extra_parts_profiles.cc | 22 +++++++++++++
chrome/browser/resources/BUILD.gn | 5 +++
chrome/browser/ui/BUILD.gn | 4 +++
chrome/browser/ui/BUILD.gn | 10 ++++++
chrome/browser/ui/prefs/pref_watcher.cc | 13 ++++++++
chrome/browser/ui/tab_helpers.cc | 13 ++++++++
chrome/chrome_paks.gni | 5 +++
chrome/common/BUILD.gn | 3 ++
16 files changed, 166 insertions(+), 1 deletion(-)
16 files changed, 172 insertions(+), 1 deletion(-)
create mode 100644 chrome/browser/adblock/README.md
create mode 100644 chrome/browser/adblock/adblock_chrome_content_browser_client.cc
create mode 100644 chrome/browser/adblock/adblock_chrome_content_browser_client.h
@@ -88,7 +88,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/application_locale_storage",
"//components/assist_ranker",
"//components/autofill/content/browser",
@@ -8363,6 +8369,7 @@ static_library("browser_public_dependencies") {
@@ -8360,6 +8366,7 @@ static_library("browser_public_dependencies") {
"//chrome/services/file_util/public/mojom",
"//components/accessibility_annotator/core",
"//components/account_id",
@@ -347,7 +347,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
@@ -312,6 +315,7 @@ group("dev_ui_resources") {
@@ -305,6 +308,7 @@ group("dev_ui_resources") {
"privacy_sandbox/internals:resources",
"usb_internals:resources",
"webnn_internals:resources",
@@ -355,7 +355,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.
"//components/commerce/core/internals/resources",
"//components/data_sharing/data_sharing_internals/resources",
"//components/download/resources/download_internals:resources",
@@ -387,6 +391,7 @@ repack("dev_ui_paks") {
@@ -380,6 +384,7 @@ repack("dev_ui_paks") {
"$root_gen_dir/chrome/predictors_resources.pak",
"$root_gen_dir/chrome/privacy_sandbox_internals_resources.pak",
"$root_gen_dir/chrome/usb_internals_resources.pak",
@@ -384,6 +384,19 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//components/affiliations/core/browser:affiliations",
"//components/autofill/content/browser",
"//components/autofill/content/browser:risk_proto",
@@ -1049,6 +1053,12 @@ static_library("ui") {
"//extensions/browser:extension_action_enums",
]
}
+ ### Android API module start
+ deps += [
+ "//components/adblock/android:java_bindings",
+ "//components/adblock/android:jni_headers",
+ ]
+ ### Android API module end
} else {
# !is_android
sources += [
diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc
--- a/chrome/browser/ui/prefs/pref_watcher.cc
+++ b/chrome/browser/ui/prefs/pref_watcher.cc