Merge branch '5986-master-upstream' into 'master' (cfd24a0e) · Commits · e / os / Browser

.config_gclient

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		solutions = [{
		"url": "https://chromium.googlesource.com/chromium/src.git",
		"managed": False,
		"name": "src",
		"custom_deps": {
		"src/native_client": None,
		"src/third_party/gvr-android-sdk/src": None,
		"src/third_party/arcore-android-sdk/src": None
		},
		"custom_hooks": [{
		"name": "gvr_static_shim_android_arm",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm_1",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm_ndk1",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm_Cr",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm64",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm64_1",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm64_ndk1",
		"condition": False
		}, {
		"name": "gvr_static_shim_android_arm64_Cr",
		"condition": False
		}, {
		"name": "gvr_static_shim_custom_libcxx_android_arm",
		"condition": False
		}, {
		"name": "gvr_static_shim_custom_libcxx_android_arm64",
		"condition": False
		}, {
		"name": "sdkextras",
		"condition": False
		}, {
		"name": "sysroot_x86",
		"condition": False
		}, {
		"name": "sysroot_x64",
		"condition": False
		}, {
		"name": "vr_controller_test_api",
		"condition": False
		}, {
		"name": "vr_test_apks",
		"condition": False
		}, {
		"name": "ar_test_apks",
		"condition": False
		}, {
		"name": "test_fonts",
		"condition": False
		}, {
		"name": "zucchini_testdata",
		"condition": False
		}, {
		"name": "Fetch Android RenderTest goldens",
		"condition": False
		}],
		"custom_vars": {
		"checkout_instrumented_libraries": False,
		"checkout_nacl": False,
		"checkout_traffic_annotation_tools": False,
		}
		}]

		target_os = ["android"]

.gitignore

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		src/
		apks/
		_gclient_src*/
		.ccache/
		.cipd/
		.gclient*
		depot_tools/

.gitlab-ci.yml

+9 −14

Original line number	Diff line number	Diff line
		stages:
		- prepare
		- build-arm
		- build-arm64
		- build-x86
		- build-x64
		- build

		variables:
		CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH
		@@ -32,29 +29,27 @@ build-docker:
		name: "$CI_JOB_NAME"
		paths:
		- apks/*
		after_script:
		- $CI_PROJECT_DIR/build.sh -c

		build-bromite-arm:
		stage: build-arm
		stage: build
		extends: .build-bromite
		script:
		- $CI_PROJECT_DIR/build.sh -a arm
		- $CI_PROJECT_DIR/build.sh -c -s -a arm

		build-bromite-arm64:
		stage: build-arm64
		stage: build
		extends: .build-bromite
		script:
		- $CI_PROJECT_DIR/build.sh -a arm64
		- $CI_PROJECT_DIR/build.sh -c -s -a arm64

		build-bromite-x86:
		stage: build-x86
		stage: build
		extends: .build-bromite
		script:
		- $CI_PROJECT_DIR/build.sh -a x86
		- $CI_PROJECT_DIR/build.sh -c -s -a x86

		build-bromite-x64:
		stage: build-x64
		stage: build
		extends: .build-bromite
		script:
		- $CI_PROJECT_DIR/build.sh -a x64
		- $CI_PROJECT_DIR/build.sh -c -s -a x64

Dockerfile

+7 −8

Original line number	Diff line number	Diff line
		FROM ubuntu:18.04

		ENV DEPOT_TOOLS "/depot_tools"
		ENV PATH "$PATH:${DEPOT_TOOLS}"
		ENV CHROMIUM_DIR "/srv/chromium"
		ENV DEBIAN_FRONTEND noninteractive

		@@ -25,25 +23,26 @@ RUN add-apt-repository -y ppa:deadsnakes/ppa

		RUN apt-get -qq update && \
		apt-get install -qqy --no-install-recommends \
		python3.8
		python3.8 lib32z1 lighttpd xvfb libncurses5:i386 libstdc++6:i386 zlib1g:i386 ccache

		RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 2
		RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
		RUN update-alternatives --set python3 /usr/bin/python3.8

		# Install chromium build dependencies
		RUN curl -s https://chromium.googlesource.com/chromium/src/+/master/build/install-build-deps.sh?format=TEXT \| base64 -d \
		RUN curl -s https://raw.githubusercontent.com/chromium/chromium/main/build/install-build-deps.sh \
		\| perl -pe 's/apt-get install \$\{do_quietly-}/DEBIAN_FRONTEND=noninteractive apt-get install -y/' \
		\| bash -e -s - \
		--no-prompt \
		--no-chromeos-fonts
		--no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt

		RUN apt-get -f install

		# Setup locale
		RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
		ENV LANG en_US.UTF-8

		# Get latest depot tools
		RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ${DEPOT_TOOLS}
		RUN git config --global user.name "John Doe"
		RUN git config --global user.email "johndoe@example.com"

		RUN mkdir ${CHROMIUM_DIR}

bromite @ a0daaacf

Original line number	Diff line number	Diff line
		Subproject commit 692764d0733a5a3d62e383cd4b8d378d611cdf24
		Subproject commit a0daaacf6dc55b692fdff58a982dd63e97ab7be6