Merge pull request #219 from brave/include_scaled_resources_to_mini_i…

…nstaller_archive Include brave_[100|200]_percent.pak in mini_installer
brave · Jul 5, 2018 · c708b7f · c708b7f
2 parents ad1979a + 23bcc8f
commit c708b7f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -95,6 +95,8 @@ copy("brave_dist_resources") {
   } else {
     sources = [
       "$root_out_dir/brave_resources.pak",
+      "$root_out_dir/brave_100_percent.pak",
+      "$root_out_dir/brave_200_percent.pak",
       "$root_out_dir/$brave_exe"
     ]
   }

diff --git 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 c365088b90b7a91faf52f5b108f64621a219b11f..7602bde419922a28244c6e225f62e6d9836cc2ca 100644
+index c365088b90b7a91faf52f5b108f64621a219b11f..b8ca81c628b565a65d973c7a0590771645dc0bde 100644
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
-@@ -181,6 +181,19 @@ template("generate_mini_installer") {
+@@ -181,6 +181,21 @@ template("generate_mini_installer") {
        "//third_party/icu:icudata",
        chrome_dll_target,
      ]
@@ -13,6 +13,8 @@ index c365088b90b7a91faf52f5b108f64621a219b11f..7602bde419922a28244c6e225f62e6d9
 +      inputs += [
 +        "$root_out_dir/brave.exe",
 +        "$root_out_dir/brave_resources.pak",
++        "$root_out_dir/brave_100_percent.pak",
++        "$root_out_dir/brave_200_percent.pak",
 +      ]
 +      deps += [
 +        "//brave:packed_resources",

diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
-index 29da523563d3dbbe773f8843dc17db9310016311..ad36ca8581f39ecefb1e3bf1ea4979e3404ace99 100644
+index 29da523563d3dbbe773f8843dc17db9310016311..5555da9c8d9e1f44257d815c94b7acd9db711b47 100644
 --- a/chrome/installer/mini_installer/chrome.release
 +++ b/chrome/installer/mini_installer/chrome.release
 @@ -6,7 +6,7 @@
@@ -11,11 +11,20 @@ index 29da523563d3dbbe773f8843dc17db9310016311..ad36ca8581f39ecefb1e3bf1ea4979e3
  #
  # Chrome version dir assembly manifest.
  # The name of this file must match the name of the version dir, so we cannot
-@@ -18,6 +18,7 @@ chrome.exe: %(ChromeDir)s\
+@@ -18,6 +18,8 @@ chrome.exe: %(ChromeDir)s\
  # Chrome version dir entries, sorted alphabetically.
  #
  chrome.dll: %(VersionDir)s\
 +brave_resources.pak: %(VersionDir)s\
++brave_100_percent.pak: %(VersionDir)s\
  chrome_100_percent.pak: %(VersionDir)s\
  chrome_child.dll: %(VersionDir)s\
  chrome_elf.dll: %(VersionDir)s\
+@@ -68,6 +70,7 @@ swiftshader\libGLESv2.dll: %(VersionDir)s\swiftshader\
+
+ [HIDPI]
+ chrome_200_percent.pak: %(VersionDir)s\
++brave_200_percent.pak: %(VersionDir)s\
+
+ [TOUCH]
+