From fcc1680f989f79e07a0e4ef4ba399f609fc388da Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Mon, 31 Aug 2020 10:44:33 -0700
Subject: [PATCH] devops: revision Chromium repackaged builds separately
 (#3698)

Currently, we mirror Chromium revisions from gbuckets to our cdn and
name them same way as Chromium revision.

However, with the upcoming bundling of FFMPEG, we'd like to revision
Chromium packages separately, since our Chromium package will depend from
a number of factors:
- chromium upstream revision
- ffmpeg version
- extra files to add to the package or remove from the package

We should be able to produce a new Chromium build once any of these changes.

With this patch, to roll Chromium browser:
- update chromium revision number in the
`//browser_patches/chromium/UPSTREAM_CONFIG.sh`
- bump the build number in the `//browser_patches/chromium/BUILD_NUMBER`

Reference #3680
---
 browser_patches/chromium/BUILD_NUMBER       | 2 +-
 browser_patches/chromium/UPSTREAM_CONFIG.sh | 1 +
 browser_patches/chromium/build.sh           | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 browser_patches/chromium/UPSTREAM_CONFIG.sh

diff --git a/browser_patches/chromium/BUILD_NUMBER b/browser_patches/chromium/BUILD_NUMBER
index fc076b6c45..83b33d238d 100644
--- a/browser_patches/chromium/BUILD_NUMBER
+++ b/browser_patches/chromium/BUILD_NUMBER
@@ -1 +1 @@
-799610
+1000
diff --git a/browser_patches/chromium/UPSTREAM_CONFIG.sh b/browser_patches/chromium/UPSTREAM_CONFIG.sh
new file mode 100644
index 0000000000..3aff46e47c
--- /dev/null
+++ b/browser_patches/chromium/UPSTREAM_CONFIG.sh
@@ -0,0 +1 @@
+UPSTREAM_CHROMIUM_REVISION=792639
diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh
index 521e2d8ab5..955b37ff2a 100755
--- a/browser_patches/chromium/build.sh
+++ b/browser_patches/chromium/build.sh
@@ -5,10 +5,11 @@ set +x
 trap "cd $(pwd -P)" EXIT
 cd "$(dirname $0)"
 
+source "./UPSTREAM_CONFIG.sh"
+
 mkdir -p output
 cd output
 
-BUILD_NUMBER=$(head -1 ../BUILD_NUMBER)
 FOLDER_NAME=""
 ZIP_NAME=""
 FILES_TO_REMOVE=()
@@ -32,7 +33,7 @@ else
   exit 1
 fi
 
-URL="https://storage.googleapis.com/chromium-browser-snapshots/${FOLDER_NAME}/${BUILD_NUMBER}/${ZIP_NAME}"
+URL="https://storage.googleapis.com/chromium-browser-snapshots/${FOLDER_NAME}/${UPSTREAM_CHROMIUM_REVISION}/${ZIP_NAME}"
 curl --output upstream.zip "${URL}"
 
 unzip upstream.zip