Merge branch '2636-master-update_to_129' into 'master' (b86f0556) · Commits · e / os / Browser

.gitlab-ci.yml

+4 −2

Original line number	Diff line number	Diff line
		@@ -7,19 +7,20 @@ variables:
		GIT_SUBMODULE_STRATEGY: recursive

		build-docker:
		image: docker:19-git
		image: docker:25.0.5-git
		stage: prepare
		tags:
		- generic_privileged
		variables:
		DOCKER_DRIVER: overlay2
		services:
		- docker:19-dind
		- docker:25.0.5-dind
		script:
		- echo "$CI_JOB_TOKEN" \| docker login registry.gitlab.e.foundation:5000 -u gitlab-ci-token --password-stdin
		- docker pull $CONTAINER_IMAGE:latest \|\| true
		- docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest ${CI_PROJECT_DIR}
		- docker push $CONTAINER_IMAGE:latest
		retry: 2

		.build-cromite:
		image: $CONTAINER_IMAGE
		@@ -30,6 +31,7 @@ build-docker:
		paths:
		- apks/*
		- bin/*
		expire_in: 1 week

		build-cromite-arm:
		stage: build

Dockerfile

+9 −6

Original line number	Diff line number	Diff line
		FROM ubuntu:20.04

		ENV CHROMIUM_DIR "/srv/chromium"
		ENV CHROMIUM_VER "127.0.6533.106"
		ENV CHROMIUM_VER "129.0.6668.71"

		RUN apt-get update && \
		DEBIAN_FRONTEND=noninteractive \
		apt-get install -y software-properties-common && \
		add-apt-repository ppa:deadsnakes/ppa && \
		add-apt-repository ppa:git-core/ppa

		RUN dpkg --add-architecture i386

		RUN apt-get update && \
		DEBIAN_FRONTEND=noninteractive \
		apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils ccache jq python3 \
		apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils ccache jq python3.10 \
		python-is-python3 sed tzdata build-essential lib32gcc-9-dev g++-multilib dos2unix wiggle git curl

		RUN apt-get update &&\
		apt-get -y install p7zip-full

		RUN mkdir ${CHROMIUM_DIR}

		RUN curl -s https://raw.githubusercontent.com/chromium/chromium/${CHROMIUM_VER}/build/install-build-deps.py \

build.sh

+14 −21

Original line number	Diff line number	Diff line
		@@ -33,8 +33,7 @@ usage() {

		build() {
		echo ">> [$(date)] Head commit: $(git show -s --format=%s)"
		apks="ChromePublic MonochromePublic SystemWebView TrichromeChrome \
		TrichromeLibrary TrichromeWebView TrichromeChrome6432 \
		apks="TrichromeChrome TrichromeLibrary TrichromeWebView TrichromeChrome6432 \
		TrichromeLibrary6432 TrichromeWebView6432"
		build_args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "

		@@ -64,19 +63,23 @@ build() {

		build_args+=' cc_wrapper="ccache"'

		echo ">> [$(date)] Using AOSP test-key for release build"
		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)] Building chromium $chromium_version for $1"
		gn gen "out/$1" --args="$build_args"
		if [ $1 '==' "x64" ] \|\| [ $1 '==' "arm64" ]; then
		build_targets="trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk"
		build_targets="$build_targets chrome_public_apk system_webview_apk monochrome_public_apk"
		else
		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
		mkdir -p "${root_dir}/apks/${apk_arch}"

		for apk in $apks; do
		if [ -f "out/${1}/apks/$apk.apk" ]; then
		@@ -85,21 +88,6 @@ build() {
		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

		# Create the 7z archive
		echo ">> [$(date)] Creating archive with debug apks"
		archive_name="${root_dir}/apks/${apk_arch}/browser_${apk_arch}_debug_apks.7z"
		7z a -t7z -mx=9 "$archive_name" "out/${1}/apks"/*.apk

		if [ $1 '==' "x64" ]; then
		echo ">> [$(date)] Building chromium subresource_filter_tools"
		mkdir -p "${root_dir}/bin"
		@@ -253,6 +241,11 @@ shift $((OPTIND - 1))
		# Add depot_tools to PATH
		if [ ! -d "$chromium_dir/depot_tools" ]; then
		git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$chromium_dir/depot_tools"
		else
		cd $chromium_dir/depot_tools
		git fetch https://chromium.googlesource.com/chromium/tools/depot_tools.git main
		git reset --hard FETCH_HEAD
		cd $chromium_dir
		fi
		export PATH="$chromium_dir/depot_tools:$PATH"

build/browser.gn_args

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,7 +21,9 @@ enable_platform_dolby_vision=false
		enable_platform_dts_audio=false
		enable_platform_encrypted_dolby_vision=false
		enable_platform_hevc=true
		enable_precompiled_headers=false
		enable_reporting=false
		enable_request_header_integrity=false
		enable_remoting=false
		enable_vr=false
		exclude_unwind_tables=false
		@@ -33,6 +35,7 @@ is_debug=false
		is_official_build=true
		proprietary_codecs=true
		rtc_build_examples=false
		safe_browsing_use_unrar=false
		symbol_level=1
		target_os="android"
		treat_warnings_as_errors=true

build/copy_cromite_patches.sh

+3 −2

Original line number	Diff line number	Diff line
		#!/bin/bash

		branch="v129.0.6668.71-385912cca32ce2d15a3e295f79d5c4dc3a6f7785"
		if [ -d cromite ]; then
		cd cromite
		git fetch origin v127.0.6533.94-5fe9b924075b8c565742b4844362e71aaa9ec0d8
		git fetch origin $branch
		git reset --hard FETCH_HEAD
		cd ..
		else
		git clone https://gitlab.e.foundation/e/os/cromite.git -b v127.0.6533.94-5fe9b924075b8c565742b4844362e71aaa9ec0d8 cromite --depth=1
		git clone https://gitlab.e.foundation/e/os/cromite.git -b $branch cromite --depth=1
		fi

		cromite_patches_list=$(cat "cromite_patches_list.txt")