From 514bdd7ab20d2d7f1a36f2590caf5e81528695dc Mon Sep 17 00:00:00 2001
From: Michael Herrmann <michael@herrmann.io>
Date: Thu, 9 Nov 2023 18:52:09 +0800
Subject: [PATCH] Support variations on Windows first run (#20829)

---
 DEPS                               | 2 +-
 build/commands/lib/config.js       | 2 ++
 build/commands/scripts/commands.js | 1 +
 build/config.gni                   | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 03da332511b..749220ce0af 100644
--- a/DEPS
+++ b/DEPS
@@ -9,7 +9,7 @@ deps = {
   "vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
   "vendor/python-patch": "https://github.com/brave/python-patch@d8880110be6554686bc08261766538c2926d4e82",
   "vendor/omaha": {
-    "url": "https://github.com/brave/omaha.git@138c95d58f9c41113f7e0dd5acdbcaab8be20df9",
+    "url": "https://github.com/brave/omaha.git@80293cd8212bdb8cc0ad38cf90551b1ee2fcd4c5",
     "condition": "checkout_win",
   },
   "vendor/sparkle": {
diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js
index 243ceb6c46b..4f1873d63fa 100644
--- a/build/commands/lib/config.js
+++ b/build/commands/lib/config.js
@@ -461,6 +461,7 @@ Config.prototype.buildArgs = function () {
   if (process.platform === 'win32' && this.build_omaha) {
     args.build_omaha = this.build_omaha
     args.tag_ap = this.tag_ap
+    args.tag_installdataindex = this.tag_installdataindex
   }
 
   if ((process.platform === 'win32' || process.platform === 'darwin') && this.build_delta_installer) {
@@ -1080,6 +1081,7 @@ Config.prototype.update = function (options) {
   if (process.platform === 'win32' && options.build_omaha) {
     this.build_omaha = true
     this.tag_ap = options.tag_ap
+    this.tag_installdataindex = options.tag_installdataindex
   }
 
   if (options.skip_signing) {
diff --git a/build/commands/scripts/commands.js b/build/commands/scripts/commands.js
index 4b457627d5f..af08b0da0d6 100644
--- a/build/commands/scripts/commands.js
+++ b/build/commands/scripts/commands.js
@@ -214,6 +214,7 @@ program
   .option('--channel <target_channel>', 'target channel to build', /^(beta|dev|nightly|release)$/i)
   .option('--build_omaha', 'build omaha stub/standalone installer')
   .option('--tag_ap <ap>', 'ap for stub/standalone installer')
+  .option('--tag_installdataindex <index>', 'installdataindex for stub/standalone installer')
   .option('--skip_signing', 'skip signing dmg/brave_installer.exe')
   .option('--build_delta_installer', 'build delta mini installer')
   .option('--last_chrome_installer <last_chrome_installer>', 'folder contains previous version uncompressed chrome.7z pack file. This folder should be in out dir.')
diff --git a/build/config.gni b/build/config.gni
index 3a9f19d99ed..01aff826283 100644
--- a/build/config.gni
+++ b/build/config.gni
@@ -32,6 +32,7 @@ declare_args() {
   chrome_version_string = ""
   build_omaha = false
   tag_ap = ""
+  tag_installdataindex = ""
   target_android_base = ""
   target_android_output_format = ""
   brave_android_keystore_path = "."