From 6a3724fb289d9d1821891cb1f5288de929f7a9fc Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 2 Jun 2021 07:21:31 +0000 Subject: [PATCH] add mtool --- prepare-build.sh | 2 ++ start-build.sh | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/prepare-build.sh b/prepare-build.sh index 0953bad..a77e3ae 100644 --- a/prepare-build.sh +++ b/prepare-build.sh @@ -6,6 +6,8 @@ NC='\033[0m' # No Color #sudo apt-get install python #sudo apt-get install wiggle sudo apt-get install lftp + +# removes these because they are in error with those installed by install-build-deps-android.sh sudo apt-get remove --auto-remove php7.4 php7.4-cgi libapache2-mod-php7.4 php7.4-common sudo apt autoremove diff --git a/start-build.sh b/start-build.sh index d9f63d2..02c4031 100644 --- a/start-build.sh +++ b/start-build.sh @@ -28,6 +28,11 @@ export GOMA_ARBITRARY_TOOLCHAIN_SUPPORT=true $GITHUB_WORKSPACE/goma/goma_ctl.py ensure_stop $GITHUB_WORKSPACE/goma/goma_ctl.py ensure_start +# download mtool +echo -e ${RED} -------- download mtool ${NC} +git clone https://github.com/bromite/mtool +sudo apt-get install parallel + cd chromium/src echo -e ${RED} -------- gn gen ${NC} @@ -42,13 +47,18 @@ if [[ OK -eq 1 ]]; then tar xf out.x86.$GITHUB_SHA.tar.gz - # TODO add mtool restore + test -f out/x86/.mtool && cp out/x86/.mtool .mtool && $GITHUB_WORKSPACE/mtool/chromium/mtime.sh --restore +fi + +if [[ -z "${GOMAJOBS}" ]]; then + GOMAJOBS=40 fi echo -e ${RED} -------- start build ${NC} -autoninja -j 40 -C out/x86 chrome_public_apk +autoninja -j $GOMAJOBS -C out/x86 chrome_public_apk -# TODO add mtool backup +$GITHUB_WORKSPACE/mtool/chromium/mtime.sh --backup +cp .mtool out/x86/ echo -e ${RED} -------- tar out ${NC} tar -czf out.x86.$GITHUB_SHA.tar.gz ./out