From 40cd52a0d56cc1efb0b56d8da9911be0c149dd56 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sun, 8 Oct 2023 19:06:54 +0200 Subject: [PATCH] v118 simple line change --- build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch | 4 ++-- build/patches/Add-option-to-force-tablet-UI.patch | 2 +- build/patches/Bromite-auto-updater.patch | 2 +- build/patches/eyeo-117.0.5938.0-android_settings.patch | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch b/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch index cea64b0e..13dea7f6 100644 --- a/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch +++ b/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch @@ -1265,7 +1265,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BUILD.gn --- a/components/adblock/android/BUILD.gn +++ b/components/adblock/android/BUILD.gn -@@ -53,7 +53,7 @@ android_library("adblock_java") { +@@ -54,7 +54,7 @@ android_library("adblock_java") { "//third_party/androidx:androidx_preference_preference_java", ] @@ -1274,7 +1274,7 @@ diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BU resources_package = "org.chromium.components.adblock" } -@@ -91,7 +91,7 @@ android_resources("java_resources") { +@@ -92,7 +92,7 @@ android_resources("java_resources") { "java/res/layout/adblock_custom_item_settings.xml", "java/res/layout/adblock_filter_lists_list_item.xml", "java/res/xml/adblock_more_options.xml", diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index c0f619aa..5d0257c7 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java -@@ -55,6 +55,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting +@@ -61,6 +61,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting return new ReaderForAccessibilityDelegate(mProfile); } diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index a555af7f..7ace04a1 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -52,7 +52,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1962,6 +1962,9 @@ if (enable_java_templates && is_android) { +@@ -1966,6 +1966,9 @@ if (enable_java_templates && is_android) { sources = [ "//build/android/java/templates/BuildConfig.template" ] defines = [] diff --git a/build/patches/eyeo-117.0.5938.0-android_settings.patch b/build/patches/eyeo-117.0.5938.0-android_settings.patch index 7abac6e0..afc56a6a 100644 --- a/build/patches/eyeo-117.0.5938.0-android_settings.patch +++ b/build/patches/eyeo-117.0.5938.0-android_settings.patch @@ -306,7 +306,7 @@ diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BU deps = [ ":java_resources", -@@ -57,6 +69,33 @@ android_resources("java_resources") { +@@ -58,6 +70,33 @@ android_resources("java_resources") { sources = [ "java/res/values/adblock_settings_locales_titles.xml", ] @@ -340,7 +340,7 @@ diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BU } android_library("adblock_java_tests") { -@@ -83,6 +122,13 @@ android_library("adblock_java_tests") { +@@ -84,6 +123,13 @@ android_library("adblock_java_tests") { "javatests/src/org/chromium/components/adblock/TestVerificationUtils.java", ] @@ -354,7 +354,7 @@ diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BU deps = [ ":adblock_java", -@@ -108,3 +154,12 @@ android_library("adblock_java_tests") { +@@ -109,3 +155,12 @@ android_library("adblock_java_tests") { "//third_party/junit:junit", ] }