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

Commit bfbb5ef5 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '4227-master-147' into 'master' 

Browser: update chromium to v147.0.7727.49

See merge request !128
parents 6ab63f8f fb95fde3

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ archive-filter: 
    name: "$CI_JOB_NAME"

    paths:

      - bin/*

    expire_in: 30 days

    expire_in: 60 days



.build-filters:

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

build/browser.gn_args

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ use_official_google_api_keys=false 
use_rtti=false

use_thin_lto=false

use_v8_context_snapshot=false

enable_glic = false

build_tflite_with_xnnpack = false

use_clang_modules = false

cromite @ 1468382f

Compare d133d52d to 1468382f
Original line number Diff line number Diff line 
Subproject commit d133d52d09c925b6542ff00e368d18d74df85e7c
 
Subproject commit 1468382f54169aba5f75f1c775ac233b05ae3456

build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch

+4 −4
Original line number Diff line number Diff line 
From 65aa3e9c36d7b03f60712ce197c378a65bd99b7a Mon Sep 17 00:00:00 2001

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

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 08:03:13 +0000

Subject: Browser: Add provider to share default search engine
@@ -13,10 +13,10 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java



diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index 9bf9ee21f527b..f6f6f9fce1ab9 100644

index c2cc6088a7d1c..66ec5014a8661 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -1420,6 +1420,12 @@ by a child template that "extends" this file.

@@ -1440,6 +1440,12 @@ by a child template that "extends" this file.

           tools:ignore="ExportedContentProvider">

       </provider>
@@ -124,5 +124,5 @@ index 9c175c0d24804..eccb0847f7cd6 100644 
 chrome_java_sources += userscripts_java_sources

+chrome_java_sources += [ "java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java" ]

-- 

2.52.0

2.53.0

build/e_patches/Browser-Change-adblock-url-to-ours.patch

+6 −6
Original line number Diff line number Diff line 
From c6f7f96594b1702e098872fcd3da2938bf676af4 Mon Sep 17 00:00:00 2001

From 2693b7ef81a4eb95cbb5f4ee1d6a32be0ad7df8b Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 10 Sep 2024 12:17:23 +0530

Subject: Browser: Change adblock url to ours
@@ -44,10 +44,10 @@ index ef6d1652c97f0..24cd56084827d 100644 
         mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL());

         mAdBlockFiltersUrlEdit.addTextChangedListener(this);

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index 0a71e3d23624a..276df0f2fc755 100644

index d2e78c33ea14d..f88a37ddf2a90 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -1356,11 +1356,11 @@ BrowserProcessImpl::adblock_updater() {

@@ -1388,11 +1388,11 @@ BrowserProcessImpl::adblock_updater() {

   std::unique_ptr<component_updater::UpdateScheduler> scheduler =

       std::make_unique<component_updater::TimerUpdateScheduler>();
@@ -64,7 +64,7 @@ index 0a71e3d23624a..276df0f2fc755 100644 
   }

 

   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(

@@ -1368,7 +1368,7 @@ BrowserProcessImpl::adblock_updater() {

@@ -1400,7 +1400,7 @@ BrowserProcessImpl::adblock_updater() {

           std::move(scheduler),

           g_browser_process->subresource_filter_ruleset_service(),

           local_state()->GetBoolean(prefs::kAdBlockEnabled),
@@ -74,7 +74,7 @@ index 0a71e3d23624a..276df0f2fc755 100644 
   return adblock_updater_.get();

 }

diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc

index 6dc1f8b92d1e8..00260f8cf9785 100644

index 3c55b8a8f75d7..982c87c838024 100644

--- a/chrome/browser/net/system_network_context_manager.cc

+++ b/chrome/browser/net/system_network_context_manager.cc

@@ -723,7 +723,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -87,5 +87,5 @@ index 6dc1f8b92d1e8..00260f8cf9785 100644 
   // Static auth params

   registry->RegisterStringPref(prefs::kAuthSchemes,

-- 

2.52.0

2.53.0