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

Copy and package dev/beta channel png images #366

Closed
wants to merge 3 commits into from
Closed

Copy and package dev/beta channel png images #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7c8762
Copy and package dev/beta channel png images
mbacchi Aug 28, 2018
1c0b631
Revert "Copy and package dev/beta channel png images"
mbacchi Aug 29, 2018
a8fb099
Replace patch with copy target in BUILD.gn
mbacchi Aug 29, 2018
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
17 changes: 17 additions & 0 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ brave_paks("packed_resources") {
}
}

branding_dir = "//chrome/app/theme/$branding_path_component"
copy("theme_files") {
visibility = [ ":*" ]
if (!is_chrome_branded) {
Copy link
Member

@simonhong simonhong Aug 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed because this target is always used when !is_chrome_branded.

sources = [
"$branding_dir/product_logo_128_beta.png",
"$branding_dir/product_logo_128_dev.png",
"$branding_dir/product_logo_128_development.png",
"$branding_dir/product_logo_128_nightly.png",
]
}
outputs = [
"$root_out_dir/installer/theme/{{source_file_part}}",
]
}

group("create_dist") {
deps = [
":create_dist_zips"
Expand All @@ -81,6 +97,7 @@ group("create_dist") {
deps += [
"//chrome/installer/linux:$linux_channel",
"//brave/app/linux:dist_resources",
":theme_files",
]
}
}
Expand Down
15 changes: 14 additions & 1 deletion patches/chrome-installer-linux-common-installer.include.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/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 58b80612445aa0616462805f464bcae0b3ee1c3e..5acee06845fe2f94ef51f5ddbf9261a33fa4df5d 100644
index 58b80612445aa0616462805f464bcae0b3ee1c3e..fdead2554de43afd1618f56f509406e241535cb4 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -75,6 +75,7 @@ process_template() (
Expand Down Expand Up @@ -30,6 +30,19 @@ index 58b80612445aa0616462805f464bcae0b3ee1c3e..5acee06845fe2f94ef51f5ddbf9261a3
# ICU data file; Necessary when the GN icu_use_data_file flag is true.
install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"

@@ -275,10 +289,10 @@ stage_install_common() {

# app icons
local icon_regex=".*product_logo_[0-9]\+\."
- if [ "$BRANDING" = "google_chrome" ]; then
+ if [ "$BRANDING" = "brave" ]; then
if [ "$CHANNEL" = "beta" ]; then
icon_regex=".*product_logo_[0-9]\+_beta\."
- elif [ "$CHANNEL" = "unstable" ]; then
+ elif [ "$CHANNEL" = "unstable" -o "$CHANNEL" = "dev" ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

icon_regex=".*product_logo_[0-9]\+_dev\."
fi
fi
@@ -381,7 +395,7 @@ stage_install_common() {
exit 1
fi
Expand Down