Merge branch 'backlog_4903-all-upstreamBrowser' into 'master' (221d246a) · Commits · e / os / Browser

bromite @ 35e91703

Original line number	Diff line number	Diff line
		Subproject commit 0b2a41b2af91b8e237e761a5690dd6734674b7a8
		Subproject commit 35e91703127cc39bf917bc5b51bc947be4729561

build.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ function patch() {
		function build() {
		local out="out/${BUILDID}_${ARCH}"
		echo ">> [$(date)] Build for ${ARCH}"
		gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/GN_ARGS) target_cpu=\"${ARCH}\" " "$out"
		gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/bromite.gn_args) target_cpu=\"${ARCH}\" " "$out"
		autoninja -C "$out" chrome_public_apk system_webview_apk
		cp "$out/apks/ChromePublic.apk" "${ROOT_DIR}/apks/ChromePublic_$ARCH.apk"
		cp "$out/apks/SystemWebView.apk" "${ROOT_DIR}/apks/SystemWebView_$ARCH.apk"

build/e_patches_list.txt

+14 −14

Original line number	Diff line number	Diff line
		0001-Browser-Change-app-and-package-name-to-browser.patch
		0001-Browser-Use-our-custom-icon-instead-of-chromium.patch
		0001-Browser-Rename-strings-to-browser.patch
		0001-Browser-Point-to-our-default-popular-sites.patch
		0001-Browser-Enable-do-not-track-by-default.patch
		0001-Browser-Add-provider-to-share-default-search-engine.patch
		0001-Browser-Disable-async-DNS-by-default-on-Android.patch
		0001-Browser-Enable-custom-tabs-by-default.patch
		0001-Browser-Enable-search-suggestion-by-default.patch
		0001-Browser-Hide-and-disable-touch-to-search-option.patch
		0001-Browser-Modify-default-search-engines.patch
		0001-Browser-Redirect-users-to-e-foundation-docs.patch
		0001-Revert-Bromite-auto-updater.patch
		0001-Revert-Block-gateway-attacks-via-websockets.patch
		0001-Revert-Disable-unified-autoplay-feature.patch
		0002-Browser-Use-our-custom-icon-instead-of-chromium.patch
		0003-Browser-Rename-strings-to-browser.patch
		0004-Browser-Point-to-our-default-popular-sites.patch
		0005-Browser-Enable-do-not-track-by-default.patch
		0006-Browser-Add-provider-to-share-default-search-engine.patch
		0007-Browser-Disable-async-DNS-by-default-on-Android.patch
		0008-Browser-Enable-custom-tabs-by-default.patch
		0009-Browser-Enable-search-suggestion-by-default.patch
		0010-Browser-Hide-and-disable-touch-to-search-option.patch
		0011-Browser-Modify-default-search-engines.patch
		0012-Browser-Redirect-users-to-e-foundation-docs.patch
		0013-Revert-Bromite-auto-updater.patch
		0014-Revert-Block-gateway-attacks-via-websockets.patch
		0015-Revert-Disable-unified-autoplay-feature.patch

build/patches/0001-Browser-Change-app-and-package-name-to-browser.patch

+3 −3

Original line number	Diff line number	Diff line
		From 009e3ecb9fae3ff95cf8b9f02ca045093a2526fc Mon Sep 17 00:00:00 2001
		From 66fb1b82194577018afe73475fd5dac22e4d5b6a Mon Sep 17 00:00:00 2001
		From: Aayush Gupta <theimpulson@e.email>
		Date: Fri, 26 Nov 2021 05:39:25 +0000
		Subject: [PATCH] Browser: Change app and package name to browser
		Subject: [PATCH 01/15] Browser: Change app and package name to browser

		Signed-off-by: Aayush Gupta <theimpulson@e.email>
		---
		@@ -10,7 +10,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
		2 files changed, 7 insertions(+), 16 deletions(-)

		diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
		index 710985b89777b..211eeded4a74e 100644
		index 465896c955bf0..da21f309f2e78 100644
		--- a/chrome/android/BUILD.gn
		+++ b/chrome/android/BUILD.gn
		@@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {

build/patches/0001-Browser-Use-our-custom-icon-instead-of-chromium.patch→build/patches/0002-Browser-Use-our-custom-icon-instead-of-chromium.patch

+2 −2

Original line number	Diff line number	Diff line
		From 1a39cb7d6e46f9bcfebaa3e681e2716c040345ea Mon Sep 17 00:00:00 2001
		From 1e4f671db28cd21f9a97b51c569a1662a0f84956 Mon Sep 17 00:00:00 2001
		From: Aayush Gupta <theimpulson@e.email>
		Date: Fri, 26 Nov 2021 06:04:08 +0000
		Subject: [PATCH] Browser: Use our custom icon instead of chromium
		Subject: [PATCH 02/15] Browser: Use our custom icon instead of chromium

		Signed-off-by: Aayush Gupta <theimpulson@e.email>
		---