Commit 8771aa91 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'emu-webview' into 'master'

browser: Add Support for x86 and x64 build

See merge request e/apps/browser!39
parents f1fc4f78 10727fda
Pipeline #149254 passed with stages
in 521 minutes and 19 seconds
......@@ -2,6 +2,8 @@ stages:
- prepare
- build-arm
- build-arm64
- build-x86
- build-x64
variables:
CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH
......@@ -90,3 +92,73 @@ build-bromite-arm64:
- cp out/${CI_JOB_ID}_arm64/apks/SystemWebView.apk ${CI_PROJECT_DIR}/apks/SystemWebView_arm64.apk
- echo ">> [$(date)] Clean"
- git reset --hard && git clean -xfdf
build-bromite-x86:
image: $CONTAINER_IMAGE
stage: build-x86
tags:
- build-browser
artifacts:
name: "$CI_JOB_NAME"
paths:
- apks/*
script:
- cd ${CHROMIUM_DIR}
- if [ ! -f .gclient ] ; then echo ">> [$(date)] Init project" ; fetch --nohooks android ; fi
- mkdir -p ${CI_PROJECT_DIR}/apks
- cd src
- git reset --hard && git clean -xfdf
- if [ -n ${CHROMIUM_VERSION} ] ; then CHROMIUM_VERSION=$(head -n 1 ${CI_PROJECT_DIR}/CHANGELOG.md | sed 's/# \(.*\)/\1/') ; export CHROMIUM_VERSION ; fi
- echo ">> [$(date)] Use Chromium v${CHROMIUM_VERSION}"
- git fetch --tags
- git checkout tags/${CHROMIUM_VERSION}
- echo ">> [$(date)] Install dependencies"
- build/install-build-deps-android.sh
- gclient sync --with_branch_heads --with_tags
- echo ">> [$(date)] Apply Bromite and /e/ patches"
- mv ${CI_PROJECT_DIR}/build/patches/e/* ${CI_PROJECT_DIR}/build/patches/
- PATCHES_LIST=$(cat ${CI_PROJECT_DIR}/build/bromite_patches_list.txt ${CI_PROJECT_DIR}/build/e_patches_list.txt)
- for file in $PATCHES_LIST; do echo " -> Apply $file"; git apply -v ${CI_PROJECT_DIR}/build/patches/$file; echo " "; done
- gclient runhooks
- echo ">> [$(date)] Build for x86"
- gn gen --args="$(cat ${CI_PROJECT_DIR}/build/GN_ARGS) target_cpu=\"x86\" " out/${CI_JOB_ID}_x86
- autoninja -C out/${CI_JOB_ID}_x86 chrome_public_apk system_webview_apk
- cp out/${CI_JOB_ID}_x86/apks/ChromePublic.apk ${CI_PROJECT_DIR}/apks/ChromePublic_x86.apk
- cp out/${CI_JOB_ID}_x86/apks/SystemWebView.apk ${CI_PROJECT_DIR}/apks/SystemWebView_x86.apk
- echo ">> [$(date)] Clean"
- git reset --hard && git clean -xfdf
build-bromite-x64:
image: $CONTAINER_IMAGE
stage: build-x64
tags:
- build-browser
artifacts:
name: "$CI_JOB_NAME"
paths:
- apks/*
script:
- cd ${CHROMIUM_DIR}
- if [ ! -f .gclient ] ; then echo ">> [$(date)] Init project" ; fetch --nohooks android ; fi
- mkdir -p ${CI_PROJECT_DIR}/apks
- cd src
- git reset --hard && git clean -xfdf
- if [ -n ${CHROMIUM_VERSION} ] ; then CHROMIUM_VERSION=$(head -n 1 ${CI_PROJECT_DIR}/CHANGELOG.md | sed 's/# \(.*\)/\1/') ; export CHROMIUM_VERSION ; fi
- echo ">> [$(date)] Use Chromium v${CHROMIUM_VERSION}"
- git fetch --tags
- git checkout tags/${CHROMIUM_VERSION}
- echo ">> [$(date)] Install dependencies"
- build/install-build-deps-android.sh
- gclient sync --with_branch_heads --with_tags
- echo ">> [$(date)] Apply Bromite and /e/ patches"
- mv ${CI_PROJECT_DIR}/build/patches/e/* ${CI_PROJECT_DIR}/build/patches/
- PATCHES_LIST=$(cat ${CI_PROJECT_DIR}/build/bromite_patches_list.txt ${CI_PROJECT_DIR}/build/e_patches_list.txt)
- for file in $PATCHES_LIST; do echo " -> Apply $file"; git apply -v ${CI_PROJECT_DIR}/build/patches/$file; echo " "; done
- gclient runhooks
- echo ">> [$(date)] Build for x64"
- gn gen --args="$(cat ${CI_PROJECT_DIR}/build/GN_ARGS) target_cpu=\"x64\" " out/${CI_JOB_ID}_x64
- autoninja -C out/${CI_JOB_ID}_x64 chrome_public_apk system_webview_apk
- cp out/${CI_JOB_ID}_x64/apks/ChromePublic.apk ${CI_PROJECT_DIR}/apks/ChromePublic_x64.apk
- cp out/${CI_JOB_ID}_x64/apks/SystemWebView.apk ${CI_PROJECT_DIR}/apks/SystemWebView_x64.apk
- echo ">> [$(date)] Clean"
- git reset --hard && git clean -xfdf
......@@ -750,6 +750,14 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
"component_updater_service.cc",
"component_updater_service.h",
"component_updater_service_internal.h",
@@ -36,6 +42,7 @@ static_library("component_updater") {
"//components/crx_file",
"//components/update_client",
"//components/version_info",
+ "//services/network/public/mojom",
"//third_party/boringssl:boringssl",
"//ui/base",
"//url",
diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
new file mode 100644
--- /dev/null
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment