Merge branch '4996-all-upstreamBrowser' into 'master'

Subproject commit 35e91703127cc39bf917bc5b51bc947be4729561

Subproject commit 692764d0733a5a3d62e383cd4b8d378d611cdf24

    PATCHES_LIST=$(cat "${ROOT_DIR}/bromite/build/bromite_patches_list.txt" "${ROOT_DIR}/build/e_patches_list.txt")

    for file in $PATCHES_LIST; do

        echo " -> Apply $file"

        git apply "${ROOT_DIR}/bromite/build/patches/$file"

        git config --global user.name "John Doe"

        git config --global user.email "johndoe@example.com"

        git am < "${ROOT_DIR}/bromite/build/patches/$file"

        echo " "

    done

    gclient runhooks

function build() {

    local out="out/${BUILDID}_${ARCH}"

    echo ">> [$(date)] Build for ${ARCH}"

    gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/bromite.gn_args) target_cpu=\"${ARCH}\" " "$out"

    gn gen --args="$(cat "${ROOT_DIR}"/build/browser.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"

android_channel="stable"

blink_symbol_level=1

build_contextual_search=false

build_with_tflite_lib=false

chrome_pgo_phase=0

dcheck_always_on=false

debuggable_apks=false

dfmify_dev_ui=false

disable_android_lint=true

disable_autofill_assistant_dfm=true

disable_fieldtrial_testing_config=true

disable_tab_ui_dfm=true

enable_av1_decoder=true

enable_dav1d_decoder=true

enable_gvr_services=false

enable_hangout_services_extension=false

enable_iterator_debugging=false

enable_mdns=false

enable_mse_mpeg2ts_stream_parser=true

enable_nacl=false

enable_platform_dolby_vision=true

enable_platform_hevc=true

enable_remoting=false

enable_reporting=false

enable_supervised_users=false

enable_vr=false

exclude_unwind_tables=false

ffmpeg_branding="Chrome"

icu_use_data_file=true

is_cfi=true

is_component_build=false

is_debug=false

is_official_build=true

proprietary_codecs=true

rtc_build_examples=false

safe_browsing_mode=0

symbol_level=1

system_webview_package_name="com.android.webview"

target_os="android"

use_cfi_cast=true

use_debug_fission=true

use_errorprone_java_compiler=false

use_gnome_keyring=false

use_official_google_api_keys=false

use_rtti=false

use_sysroot=false

webview_includes_weblayer=false

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

0007-Browser-Enable-custom-tabs-by-default.patch

0008-Browser-Enable-search-suggestion-by-default.patch

0009-Browser-Modify-default-search-engines.patch

0010-Browser-Redirect-users-to-e-foundation-docs.patch

0011-Revert-Bromite-auto-updater.patch

0012-Revert-Block-gateway-attacks-via-websockets.patch

0013-Revert-Disable-unified-autoplay-feature.patch

From 66fb1b82194577018afe73475fd5dac22e4d5b6a Mon Sep 17 00:00:00 2001

From 8aefc955dec1242bc7671d961f3fca2661bdacd7 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 05:39:25 +0000

Subject: [PATCH 01/15] Browser: Change app and package name to browser

Subject: [PATCH 01/13] Browser: Change app and package name to browser

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 465896c955bf0..da21f309f2e78 100644

index db951d4f1470a..0697a16792cf2 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) {

@@ -44,16 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {

   assert(current_toolchain != android_secondary_abi_toolchain)

 }

 declare_args() {

   # Android package name to use when compiling the public chrome targets

@@ -64,7 +55,7 @@ declare_args() {

@@ -65,7 +56,7 @@ declare_args() {

   # for details.

   chrome_public_manifest_package = _default_package

 }