From 49cda3d3dfc6f51a5872fd23c5b1c68f06a4538c Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Mon, 1 Nov 2021 17:05:39 -0700
Subject: [PATCH] devops: fix sysroot installation for Chromium Arm64 linux
 builds (#9950)

---
 browser_patches/chromium/build.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh
index 187c598f1f..9c0f526224 100755
--- a/browser_patches/chromium/build.sh
+++ b/browser_patches/chromium/build.sh
@@ -84,6 +84,11 @@ compile_chromium() {
   cat ./out/Default/args.gn
   echo "===== ======= ====="
 
+  if [[ $1 == "--compile-linux-arm64" ]]; then
+    # Install sysroot image, see https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/linux/chromium_arm.md
+    ./build/linux/sysroot_scripts/install-sysroot.py --arch=arm
+  fi
+
   if [[ $1 == "--compile-win"* ]]; then
     if [[ -z "$USE_GOMA" ]]; then
       /c/Windows/System32/cmd.exe "/c $(cygpath -w "${SCRIPT_FOLDER}"/buildwin.bat)"
@@ -97,10 +102,6 @@ compile_chromium() {
     else
       TARGETS="chrome"
     fi
-    if [[ $1 == "--compile-linux-arm64" ]]; then
-      # Install sysroot image, see https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/linux/chromium_arm.md
-      ./build/linux/sysroot_scripts/install-sysroot.py --arch=arm
-    fi
     if [[ -z "$USE_GOMA" ]]; then
       autoninja -C out/Default $TARGETS
     else