From 57fabd9b040cd78088835cd2a0366de6aaf806fb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 30 May 2021 07:20:40 +0000
Subject: [PATCH] add install-build-deps-android after download

---
 prepare-build.sh     | 12 ++++++++----
 start-build.sh       |  2 --
 start-goma-server.sh |  8 ++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/prepare-build.sh b/prepare-build.sh
index 77e2da2..9380328 100644
--- a/prepare-build.sh
+++ b/prepare-build.sh
@@ -29,8 +29,9 @@ echo -e ${RED} -------- set envs ${NC}
 PATH=$PWD/chromium/src/third_party/llvm-build/Release+Asserts/bin:$PWD/depot_tools/:/usr/local/go/bin:$PATH
 
 echo -e ${RED} -------- download chromium pre-prepared ${NC}
-rm chromium.$VERSION.tar.gz
-lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; get chromium.$VERSION.tar.gz; quit" && OK=1 || OK=0
+#rm chromium.$VERSION.tar.gz
+wget -qO- ftp://$FTP_USER:$FTP_PWD@$FTP_HOST/bromite/chromium.$VERSION.tar.gz | tar xz - && OK=1 || OK=0
+#lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; get chromium.$VERSION.tar.gz; quit" && OK=1 || OK=0
 if [[ OK -eq 0 ]]; then
     echo -e ${RED} -------- not found ${NC}
 
@@ -88,9 +89,12 @@ if [[ OK -eq 0 ]]; then
     echo -e ${RED} -------- uploading to storage ${NC}
     lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; put chromium.$VERSION.tar.gz; quit"
 else
-    echo -e ${RED} -------- unpacking ${NC}
+    echo -e ${RED} -------- unpacked ${NC}
 
-    tar xf chromium.$VERSION.tar.gz
+    echo -e ${RED} -------- running install-build-deps-android ${NC}
+    sudo chromium/src/build/install-build-deps-android.sh
+
+    #tar xf chromium.$VERSION.tar.gz
 fi
 
 rm chromium.$VERSION.tar.gz
diff --git a/start-build.sh b/start-build.sh
index 1ecebea..ee0d3e3 100644
--- a/start-build.sh
+++ b/start-build.sh
@@ -7,8 +7,6 @@ NC='\033[0m' # No Color
 #    GITHUB_SHA=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.head.sha)
 #fi
 
-sudo apt-get install -y libxkbcommon-dev
-
 echo -e ${RED} -------- set envs ${NC}
 PATH=$PWD/chromium/src/third_party/llvm-build/Release+Asserts/bin:$PWD/depot_tools/:/usr/local/go/bin:$PATH
 
diff --git a/start-goma-server.sh b/start-goma-server.sh
index e445c6a..a50f17c 100755
--- a/start-goma-server.sh
+++ b/start-goma-server.sh
@@ -1,9 +1,17 @@
 #!/bin/bash
 
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
 #export GOPATH=~/go
 #export GOCACHE=~/go
 export REDISHOST=localhost
 
+echo -e ${RED} -------- cloning goma-server ${NC}
+
 git clone https://github.com/uazo/goma-server
+
+echo -e ${RED} -------- start goma-server ${NC}
+
 cd ./goma-server/
 go run ./cmd/remoteexec_proxy/main.go --port 5050 --remoteexec-addr $REMOTEEXEC_ADDR --remote-instance-name default_instance --insecure-remoteexec --allowed-users ppp --exec-config-file "./config-file" --exec-check-cache-timeout 30s --exec-max-retry-count 50 --exec-execute-timeout 600s >log.txt 2>&1 &