Merge branch '1888-master-update_to_121' into 'master'

    - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest ${CI_PROJECT_DIR}

    - docker push $CONTAINER_IMAGE:latest

.build-bromite:

.build-cromite:

  image: $CONTAINER_IMAGE

  tags:

    - build-browser

    paths:

      - apks/*

build-bromite-arm:

build-cromite-arm:

  stage: build

  extends: .build-bromite

  extends: .build-cromite

  script:

    - $CI_PROJECT_DIR/build.sh -c -s -a arm

build-bromite-arm64:

build-cromite-arm64:

  stage: build

  extends: .build-bromite

  extends: .build-cromite

  script:

    - $CI_PROJECT_DIR/build.sh -c -s -a arm64

build-bromite-x86:

build-cromite-x86:

  stage: build

  extends: .build-bromite

  extends: .build-cromite

  script:

    - $CI_PROJECT_DIR/build.sh -c -s -a x86

build-bromite-x64:

build-cromite-x64:

  stage: build

  extends: .build-bromite

  extends: .build-cromite

  script:

    - $CI_PROJECT_DIR/build.sh -c -s -a x64

RUN mkdir ${CHROMIUM_DIR}

RUN curl -s https://raw.githubusercontent.com/chromium/chromium/main/build/install-build-deps.py \

RUN curl -s https://raw.githubusercontent.com/chromium/chromium/121.0.6167.164/build/install-build-deps.py \

       | python - --android --lib32 --no-chromeos-fonts --no-prompt

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

/e/OS Browser is an open-source fork of [Cromite](https://github.com/uazo/cromite) (Fork of bromite) which is based on [Chromium](https://www.chromium.org/Home) licensed and distributed under [The GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html). It has several additional changes to improve user experience, security, and privacy. It is shipped as the default browser on /e/OS.

## Enhancements

Following are the enhancements offered by Browser over bromite:

Following are the enhancements offered by Browser over cromite:

- Disabled by default:

    - Autofill,

    - Async DNS

if [ ! -d "$chromium_dir" ]; then

    chromium_dir=$root_dir

fi

chromium_version="119.0.6045.200"

chromium_version="121.0.6167.164"

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

chromium_url=https://github.com/chromium/chromium.git

clean=0

gsync=0

history=1

test=0

arch=""

usage() {

    echo "    -u Show this message"

    echo "    -s Sync source"

    echo "    -h Sync without history"

    echo "    -t Sign with AOSP test-key"

    echo

    exit 1

}

    build_args+=' android_default_version_name="'$chromium_version'"'

    build_args+=' android_default_version_code="'$code'"'

    if [ $test -eq 1 ]; then

        echo ">> [$(date)] Using AOSP test-key to sign"

        keystore_path="${root_dir}/platform.jks"

        build_args+=' android_keystore_path="'$keystore_path'"'

        build_args+=' android_keystore_name="platform"'

        build_args+=' android_keystore_password="platform"'

        build_args+=' trichrome_certdigest="c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8"'

    fi

    if [ $clean -eq 1 ]; then

        if [ -d "out/$1" ]; then

            rm -rf "out/$1"

        build_targets="trichrome_webview_apk trichrome_chrome_apk trichrome_library_apk"

    fi

    mkdir -p "${root_dir}/apks/${apk_arch}"

    echo ">> [$(date)] Using chromium test-key for release build"

    ninja -C out/$1 $build_targets

    for apk in $apks; do

        if [ -f "out/${1}/apks/$apk.apk" ]; then

            echo ">> [$(date)] Moving $apk for ${apk_arch} to output folder"

            mkdir -p "${root_dir}/apks/${apk_arch}"

            echo ">> [$(date)] Moving release $apk for ${apk_arch} to output folder"

            mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/${apk_arch}/$(echo "$apk" | sed 's/[0-9]*//g').apk"

        fi

    done

    keystore_path="${root_dir}/platform.jks"

    build_args+=' android_keystore_path="'$keystore_path'"'

    build_args+=' android_keystore_name="platform"'

    build_args+=' android_keystore_password="platform"'

    build_args+=' trichrome_certdigest="c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8"'

    echo ">> [$(date)] Using AOSP test-key for debug build"

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

    ninja -C out/$1 $build_targets

    for apk in $apks; do

        if [ -f "out/${1}/apks/$apk.apk" ]; then

            echo ">> [$(date)] Moving debug $apk for ${apk_arch} to output folder"

            mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/${apk_arch}/$(echo "$apk" | sed 's/[0-9]*//g')_debug.apk"

        fi

    done

}

setup_ccache() {

patch() {

    cd $chromium_dir/src

    echo ">> [$(date)] Applying bromite and /e/ patches"

    echo ">> [$(date)] Applying cromite and /e/ patches"

    bromite_patches_list=$(cat "${root_dir}/build/bromite_patches_list.txt")

    for file in $bromite_patches_list; do

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/bromite_patches/$file"

    cromite_patches_list=$(cat "${root_dir}/build/cromite_patches_list.txt")

    for file in $cromite_patches_list; do

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/cromite_patches/$file"

    done

    e_patches_list=$(cat "${root_dir}/build/e_patches_list.txt")

    fi

}

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

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

    case $opt in

    a) arch="$OPTARG" ;;

    c) clean=1 ;;

    u) usage ;;

    s) gsync=1  ;;

    h) history=0 ;;

    t) test=1 ;;

    :)

        echo "Option -$OPTARG requires an argument"

        echo

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

Date: Thu, 12 Oct 2017 08:09:24 +0200

Subject: Do not hide component extensions

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 extensions/browser/api/management/management_api.cc | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc

--- a/extensions/browser/api/management/management_api.cc

+++ b/extensions/browser/api/management/management_api.cc

@@ -75,7 +75,8 @@ AutoConfirmForTest auto_confirm_for_test = DO_NOT_SKIP;

 // Returns true if the extension should be exposed via the chrome.management

 // API.

 bool ShouldExposeViaManagementAPI(const Extension& extension) {

-  return !Manifest::IsComponentLocation(extension.location());

+  // do not hide component extensions

+  return true;

 }

 std::vector<std::string> CreateWarningsList(const Extension* extension) {

--

2.25.1