From bec4a13dcd9e0efdc4ecdebd9c9c0947efb38899 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Tue, 9 Jan 2018 16:00:31 -0500
Subject: [PATCH] Add create_dist for Windows

---
 .gitignore                                      |  1 +
 BUILD.gn                                        |  1 -
 ...rome-installer-mini_installer-BUILD.gn.patch | 17 +++++++++++++++--
 ...nstaller-mini_installer-chrome.release.patch | 12 ++++++++++++
 patches/chrome-installer-util-BUILD.gn.patch    | 12 ++++++++++++
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 patches/chrome-installer-mini_installer-chrome.release.patch
 create mode 100644 patches/chrome-installer-util-BUILD.gn.patch

diff --git a/.gitignore b/.gitignore
index 3a8e50b3c034..ad58ce487bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ node_modules/
 *.sln
 debug.log
 npm-debug.log
+*~
diff --git a/BUILD.gn b/BUILD.gn
index eddc3cf251fc..8d4c13ac57f3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -29,7 +29,6 @@ group("brave") {
 }
 
 repack("packed_extra_resources") {
-  visibility = [ "./*" ]
   sources = [
     "$root_gen_dir/components/brave_components_resources.pak",
     "$target_gen_dir/browser/resources/brave_extension.pak",
diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch
index 3f40bf2debe7..13f6d884b019 100644
--- a/patches/chrome-installer-mini_installer-BUILD.gn.patch
+++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-index cc3782f4a91da503a743d38740210f8f8a973e8d..b82f855146f80e8ffa4ad3a3ba438dcc5a3c1623 100644
+index cc3782f4a91da503a743d38740210f8f8a973e8d..e5da0757587fca503577892afd84ed4eaf35787e 100644
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
-@@ -130,7 +130,7 @@ template("generate_mini_installer") {
+@@ -130,11 +130,12 @@ template("generate_mini_installer") {
  
      inputs = [
        "$chrome_dll_file",
@@ -11,3 +11,16 @@ index cc3782f4a91da503a743d38740210f8f8a973e8d..b82f855146f80e8ffa4ad3a3ba438dcc
        "$root_out_dir/locales/en-US.pak",
        "$root_out_dir/setup.exe",
        "$root_out_dir/v8_context_snapshot.bin",
+       release_file,
++      "$root_out_dir/brave_resources.pak",
+     ]
+ 
+     outputs = [
+@@ -179,6 +180,7 @@ template("generate_mini_installer") {
+       "//third_party/icu:icudata",
+       "//tools/v8_context_snapshot",
+       chrome_dll_target,
++      "//brave:packed_extra_resources",
+     ]
+ 
+     if (enable_hidpi) {
diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch
new file mode 100644
index 000000000000..fb93a886cd11
--- /dev/null
+++ b/patches/chrome-installer-mini_installer-chrome.release.patch
@@ -0,0 +1,12 @@
+diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
+index fe8c8c00e57dcf1cb154448d05eba6ac209ee3ed..5b5f05cbdf866ace7572066709e426b40e2e60ff 100644
+--- a/chrome/installer/mini_installer/chrome.release
++++ b/chrome/installer/mini_installer/chrome.release
+@@ -18,6 +18,7 @@ chrome.exe: %(ChromeDir)s\
+ # Chrome version dir entries, sorted alphabetically.
+ #
+ chrome.dll: %(VersionDir)s\
++brave_resources.pak: %(VersionDir)s\
+ chrome_100_percent.pak: %(VersionDir)s\
+ chrome_child.dll: %(VersionDir)s\
+ chrome_elf.dll: %(VersionDir)s\
diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch
new file mode 100644
index 000000000000..52ff8699f32a
--- /dev/null
+++ b/patches/chrome-installer-util-BUILD.gn.patch
@@ -0,0 +1,12 @@
+diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
+index 2cf4027737f73cff9fcd061ed46b6b92f3587e84..ed50f727682cc228ddbed518a3271999fcda0403 100644
+--- a/chrome/installer/util/BUILD.gn
++++ b/chrome/installer/util/BUILD.gn
+@@ -239,6 +239,7 @@ action("generate_strings") {
+ 
+   inputs = [
+     grdfile,
++    "//chrome/app/brave_strings.grd",
+   ]
+ 
+   outputs = [