Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed0e3f49 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '1738-master-new_ad-filter' into 'master' 

Add cromite ad block filter

See merge request !62
parents 23aec649 4804e89d

build.sh

+8 −5
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ usage() { 
    echo "  Options:"

    echo "    -a <arch> Build specified arch"

    echo "    -c Clean"

    echo "    -h Show this message"

    echo "    -s Sync without history"

    echo "    -u Show this message"

    echo "    -s Sync source"

    echo "    -h Sync without history"

    echo

    exit 1

}
@@ -136,6 +137,7 @@ sync() { 
    gclient_config

    if [ -d "$chromium_dir/src" ]; then

        cd $chromium_dir/src

        git checkout main

        git fetch origin refs/tags/$chromium_version

        git reset --hard FETCH_HEAD

    fi
@@ -175,12 +177,13 @@ init_repo(){ 
    fi

}



while getopts ":a:chr:s" opt; do

while getopts ":a:cur:sh" opt; do

    case $opt in

    a) arch="$OPTARG" ;;

    c) clean=1 ;;

    h) usage ;;

    s) gsync=1 && history=0 ;;

    u) usage ;;

    s) gsync=1  ;;

    h) history=0 ;;

    :)

        echo "Option -$OPTARG requires an argument"

        echo

build/bromite_patches/00AdblockPlus-add-blocking-in-service-workers.patch

0 → 100644
+732 −0

File added.

Preview size limit exceeded, changes collapsed.

build/bromite_patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch

0 → 100644
+8192 −0

File added.

Preview size limit exceeded, changes collapsed.

build/bromite_patches/00Fix-eyeo-Browser-Ad-filtering-patches.patch

0 → 100644
+146 −0
Original line number Diff line number Diff line 
From: uazo <uazo@users.noreply.github.com>

Date: Wed, 6 Sep 2023 15:25:18 +0000

Subject: Fix eyeo Browser Ad filtering patches



---

 chrome/browser/BUILD.gn                                 | 4 ----

 chrome/browser/client_hints/client_hints_browsertest.cc | 7 +------

 chrome/browser/extensions/BUILD.gn                      | 4 ----

 chrome/browser/preferences/BUILD.gn                     | 4 ----

 chrome/browser/ui/BUILD.gn                              | 6 ------

 chrome/browser/ui/tab_helpers.cc                        | 4 ----

 extensions/common/mojom/api_permission_id.mojom         | 3 ---

 7 files changed, 1 insertion(+), 31 deletions(-)



diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

--- a/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

@@ -2085,12 +2085,8 @@ static_library("browser") {

     "//chrome/common/notifications",

     "//chrome/installer/util:with_no_strings",

     "//chrome/services/speech/buildflags",

-<<<<<<< HEAD

-=======

-    "//chromeos/components/kiosk",

     "//components/adblock/content:browser",

     "//components/adblock/core/converter",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/assist_ranker",

     "//components/autofill/content/browser",

     "//components/autofill/core/browser",

diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc

--- a/chrome/browser/client_hints/client_hints_browsertest.cc

+++ b/chrome/browser/client_hints/client_hints_browsertest.cc

@@ -652,17 +652,12 @@ class ClientHintsBrowserTest : public policy::PolicyTest {

     // Force-enable the ClientHintsFormFactor feature, so that the header is

     // represented in the various header counts.

     feature_list->InitializeFromCommandLine(

-<<<<<<< HEAD

-        "UserAgentClientHint,CriticalClientHint,AcceptCHFrame,"

-        "ClientHintsFormFactor",

-        "");

-=======

         "UserAgentClientHint,CriticalClientHint,AcceptCHFrame",

+        "ClientHintsFormFactor",

 	// Disabling AdblockPlus because the async implementation of

         // AdblockURLLoaderThrottle::WillStartRequest confuses

         // ThirdPartyURLLoaderInterceptor.

         "AdblockPlus");

->>>>>>> 9402d5c48c0e8... Squashed commits

     return feature_list;

   }

 

diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn

--- a/chrome/browser/extensions/BUILD.gn

+++ b/chrome/browser/extensions/BUILD.gn

@@ -821,11 +821,7 @@ static_library("extensions") {

     "//chrome/browser/safe_browsing:metrics_collector",

     "//chrome/browser/ui/tabs:tab_enums",

     "//chrome/browser/web_applications",

-<<<<<<< HEAD

-=======

-    "//chromeos/components/kiosk",

     "//components/adblock/content:browser",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/cbor:cbor",

     "//components/commerce/core:pref_names",

     "//components/device_reauth",

diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn

--- a/chrome/browser/preferences/BUILD.gn

+++ b/chrome/browser/preferences/BUILD.gn

@@ -38,12 +38,8 @@ android_library("java") {

 # TODO(chouinard,estade): Consider breaking this target up into a different target for each pref file.

 java_cpp_strings("java_pref_names_srcjar") {

   sources = [

-<<<<<<< HEAD

     "//chrome/common/pref_names.h",

-=======

-    "//chrome/common/pref_names.cc",

     "//components/adblock/core/common/adblock_prefs.cc",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/autofill/core/common/autofill_prefs.cc",

     "//components/commerce/core/pref_names.cc",

     "//components/dom_distiller/core/pref_names.cc",

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

@@ -447,11 +447,8 @@ static_library("ui") {

     "//chrome/browser/storage_access_api",

     "//chrome/browser/ui/side_panel:side_panel_enums",

     "//chrome/browser/ui/webui:configs",

-<<<<<<< HEAD

     "//chrome/browser/ui/webui/location_internals:mojo_bindings",

-=======

     "//chrome/browser/ui/webui/adblock_internals:mojo_bindings",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//chrome/browser/ui/webui/omnibox:mojo_bindings",

     "//chrome/browser/ui/webui/segmentation_internals:mojo_bindings",

     "//chrome/browser/ui/webui/suggest_internals:mojo_bindings",

@@ -467,11 +464,8 @@ static_library("ui") {

     "//components/about_ui",

     "//components/access_code_cast/common:metrics",

     "//components/account_id",

-<<<<<<< HEAD

     "//components/autofill/content/browser",

-=======

     "//components/adblock/content:browser",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/autofill/content/browser:risk_proto",

     "//components/autofill/core/browser",

     "//components/blocked_content",

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -17,14 +17,10 @@

 #include "base/trace_event/trace_event.h"

 #include "build/build_config.h"

 #include "build/chromeos_buildflags.h"

-<<<<<<< HEAD

 #include "chrome/browser/3pcd/heuristics/opener_heuristic_tab_helper.h"

-=======

-#include "chrome/browser/3pcd_heuristics/opener_heuristic_tab_helper.h"

 #include "chrome/browser/adblock/element_hider_factory.h"

 #include "chrome/browser/adblock/sitekey_storage_factory.h"

 #include "chrome/browser/adblock/subscription_service_factory.h"

->>>>>>> 9402d5c48c0e8... Squashed commits

 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

 #include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h"

 #include "chrome/browser/browser_process.h"

diff --git a/extensions/common/mojom/api_permission_id.mojom b/extensions/common/mojom/api_permission_id.mojom

--- a/extensions/common/mojom/api_permission_id.mojom

+++ b/extensions/common/mojom/api_permission_id.mojom

@@ -278,12 +278,9 @@ enum APIPermissionID {

   kSmartCardProviderPrivate = 247,

   kChromeOSEvents = 248,

   kChromeOSAttachedDeviceInfo = 249,

-<<<<<<< HEAD

   kReadingList = 250,

-=======

   kAdblockPrivate = 999,

   kEyeoFilteringPrivate = 1000,

->>>>>>> 9402d5c48c0e8... Squashed commits

 

   // Add new entries at the end of the enum and be sure to update the

   // "ExtensionPermission3" enum in tools/metrics/histograms/enums.xml

--

2.25.1

build/bromite_patches/Bromite-subresource-adblocker.patch

+9 −9
Original line number Diff line number Diff line 
From 8d9da224cf38c33591926b916b43719df7801235 Mon Sep 17 00:00:00 2001

From 2daee8165ff498b1ae5cc4a43e46e6d206a6fa82 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sat, 14 Sep 2019 10:20:08 +0200

Subject: [PATCH 091/192] Bromite subresource adblocker

Subject: [PATCH] Bromite subresource adblocker



Add option to configure the ad blocker filters URL

Disable look-alike, metrics, ablation and navigation throttles
@@ -63,10 +63,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 create mode 100644 components/component_updater/download_filters_task.h



diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index ff2fb13bb9395..04622b7bf6f1f 100644

index d33a3a3d25d8b..9e5ef08571855 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -288,6 +288,7 @@ if (current_toolchain == default_toolchain) {

@@ -293,6 +293,7 @@ if (current_toolchain == default_toolchain) {

       "//chrome/android/modules/image_editor/provider:java",

       "//chrome/android/modules/stack_unwinder/provider:java",

       "//chrome/android/webapk/libs/client:client_java",
@@ -254,13 +254,13 @@ index 0000000000000..36ea147ed2693 
+

+</PreferenceScreen>

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

index c14807c7e3cac..5a4a3480838d4 100644

index 67d0527966bf4..4bd95c57c0839 100644

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -72,6 +72,11 @@ found in the LICENSE file.

         android:key="safety_check"

         android:order="12"

         android:title="@string/prefs_safety_check"/>

@@ -71,6 +71,11 @@

         android:key="eyeo_adblock"

         android:order="13"

         android:title="@string/adblock_settings_title" />

+    <Preference

+        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"

+        android:key="adblock"