Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include brave_[100|200]_percent.pak in mini_installer #219

Merged
merged 1 commit into from
Jul 5, 2018
Merged

Include brave_[100|200]_percent.pak in mini_installer #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Expand Down
6 changes: 4 additions & 2 deletions patches/chrome-installer-mini_installer-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
]
Expand All @@ -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",
Expand Down
13 changes: 11 additions & 2 deletions patches/chrome-installer-mini_installer-chrome.release.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 @@
Expand All @@ -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]