Revert "Browser: build arm trichrome seperate"

build() {

    echo ">> [$(date)] Head commit: $(git show -s --format=%s)"

    apks="ChromePublic SystemWebView TrichromeChrome TrichromeLibrary TrichromeWebView TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432"

    apks="ChromePublic SystemWebView TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432"

    build_args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "

    apk_arch=${1}

    echo ">> [$(date)] Building chromium $chromium_version for $1"

    gn gen "out/$1" --args="$build_args"

    ninja -C out/$1 chrome_public_apk system_webview_apk

    if [ $1 '==' "x64" ] || [ $1 '==' "arm64" ]; then

        ninja -C out/$1 trichrome_webview_64_32_apk trichrome_chrome_64_32_apk

        ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \

                trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk \

                chrome_public_apk system_webview_apk

    elif [ $1 '==' "x86" ] || [ $1 '==' "arm" ]; then

        ninja -C out/$1 trichrome_webview_apk trichrome_chrome_apk

        ninja -C out/$1 chrome_public_apk system_webview_apk

    fi

    for apk in $apks; do

From 5066e7cc4f90d39d5fc83629f4842832b59dd540 Mon Sep 17 00:00:00 2001

From: TheScarastic <warabhishek@e.email>

Date: Fri, 2 Dec 2022 10:10:43 +0000

Subject: [PATCH 02/34] chromium: Add 32 bit chrome app support

Signed-off-by: althafvly <althafvly@gmail.com>

---

 chrome/android/BUILD.gn | 9 +++++++++

 1 file changed, 9 insertions(+)

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

index fb0512ba96ae8..c34e2cce882f6 100644

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

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

@@ -2707,6 +2707,15 @@ if (current_toolchain == default_toolchain) {

       is_64_bit_browser = true

       include_32_bit_webview = false

     }

+

+    chrome_public_apk_or_module_tmpl("trichrome_chrome_32_apk") {

+      apk_name = "TrichromeChrome32"

+      is_trichrome = true

+      target_type = "android_apk"

+      static_library_provider = ":trichrome_library_32_apk"

+      is_64_bit_browser = false

+      include_32_bit_webview = true

+    }

   }

   # As compared to chrome_public_test_apk, this target contains only unit tests

-- 

2.34.1

0017-Automated-domain-substitution.patch

0001-add-trichrome-browser-apk-targets.patch

0002-chromium-Add-32-bit-chrome-app-support.patch

0002-Browser-Change-app-and-package-name-to-browser.patch

0003-Browser-Point-to-our-default-popular-sites.patch

0004-Browser-Enable-do-not-track-by-default.patch