From 544dcd8804ecd5dcab46f65e3991cdeda4bed678 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Thu, 28 Oct 2021 11:48:57 -0700
Subject: [PATCH] devops: default chromium checkout to $HOME/chromium (#9859)

This defaults Chromium checkout to $HOME/chromium unless a
`CR_CHROMIUM_CHECKOUT` is specified.
---
 browser_patches/chromium/archive.sh |  8 ++++++++
 browser_patches/chromium/build.sh   |  5 ++---
 browser_patches/chromium/clean.sh   |  7 ++++++-
 browser_patches/prepare_checkout.sh | 11 +++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/browser_patches/chromium/archive.sh b/browser_patches/chromium/archive.sh
index 69b28a7841..84448401ad 100755
--- a/browser_patches/chromium/archive.sh
+++ b/browser_patches/chromium/archive.sh
@@ -49,6 +49,14 @@ main() {
 }
 
 function archive_compiled_chromium() {
+  if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
+    CR_CHECKOUT_PATH="$HOME/chromium"
+  fi
+  if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
+    echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?"
+    exit 1
+  fi
+
   CHROMIUM_FOLDER_NAME=""
   CHROMIUM_FILES_TO_ARCHIVE=()
 
diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh
index b16dfe858a..496e9cabe1 100755
--- a/browser_patches/chromium/build.sh
+++ b/browser_patches/chromium/build.sh
@@ -32,11 +32,10 @@ main() {
 
 compile_chromium() {
   if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
-    echo "ERROR: chromium compilation requires CR_CHECKOUT_PATH to be set to reuse checkout."
-    exit 1
+    CR_CHECKOUT_PATH="$HOME/chromium"
   fi
 
-  if [[ -z "${CR_CHECKOUT_PATH}/src" ]]; then
+  if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
     echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?"
     exit 1
   fi
diff --git a/browser_patches/chromium/clean.sh b/browser_patches/chromium/clean.sh
index 7b22fb259d..784f319346 100755
--- a/browser_patches/chromium/clean.sh
+++ b/browser_patches/chromium/clean.sh
@@ -6,7 +6,12 @@ trap "cd $(pwd -P)" EXIT
 cd "$(dirname "$0")"
 
 rm -rf output
-if [[ ! -z "${CR_CHECKOUT_PATH}" ]]; then
+if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
+  CR_CHECKOUT_PATH="$HOME/chromium"
+fi
+
+if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
   rm -rf "${CR_CHECKOUT_PATH}/src/out"
 fi
 
+
diff --git a/browser_patches/prepare_checkout.sh b/browser_patches/prepare_checkout.sh
index 3c024d7779..3538851212 100755
--- a/browser_patches/prepare_checkout.sh
+++ b/browser_patches/prepare_checkout.sh
@@ -33,9 +33,7 @@ function prepare_chromium_checkout {
   source "${SCRIPT_PATH}/chromium/ensure_depot_tools.sh"
 
   if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
-    echo "ERROR: chromium compilation requires CR_CHECKOUT_PATH to be set to reuse checkout."
-    echo "NOTE: we expect '\$CR_CHECKOUT_PATH/src' to exist to be a valid chromium checkout."
-    exit 1
+    CR_CHECKOUT_PATH="$HOME/chromium"
   fi
 
   # Get chromium SHA from the build revision.
@@ -47,7 +45,7 @@ function prepare_chromium_checkout {
   # Update Chromium checkout.
   #
   # This is based on https://chromium.googlesource.com/chromium/src/+/master/docs/linux/build_instructions.md#get-the-code
-  if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
+  if [[ ! -d "${CR_CHECKOUT_PATH}" ]]; then
     rm -rf "${CR_CHECKOUT_PATH}"
     mkdir -p "${CR_CHECKOUT_PATH}"
     cd "${CR_CHECKOUT_PATH}"
@@ -58,6 +56,11 @@ function prepare_chromium_checkout {
     fi
     gclient runhooks
   fi
+  if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
+    echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?"
+    exit 1
+  fi
+
   cd "${CR_CHECKOUT_PATH}/src"
   git checkout master
   git pull origin master