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

Add missing requirements to Linux zip #305

Merged
merged 1 commit into from
Aug 2, 2018
+27 −9
Merged

Add missing requirements to Linux zip #305

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
36 changes: 27 additions & 9 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import("//build/config/locales.gni")
import("//build/util/process_version.gni")
import("//media/cdm/library_cdm/cdm_paths.gni")
import("//brave/brave_paks.gni")
import("//tools/v8_context_snapshot/v8_context_snapshot.gni")

if (is_mac) {
import("//build/config/mac/rules.gni")
Expand Down Expand Up @@ -175,23 +176,40 @@ process_version("generate_version") {
copy("brave_dist_resources") {
sources = [ "$root_out_dir/version" ]

if (!is_mac) {
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"
]
}

deps = [
":brave",
":generate_version",
":brave_license_dist_resources",
":packed_resources",
"build/$target_os:brave",
"//third_party/icu:icudata",
]

if (!is_mac) {
sources += [
Copy link
Collaborator

@bridiver bridiver Aug 1, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

it seems like we have too many pak files here, they should be consolidated into 3 using repack if they aren't already (brave (or maybe chrome to avoid patching)/100/200)

Copy link
Member

Choose a reason for hiding this comment

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

Yep right. Created issue for this (brave/brave-browser#672).

"$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",
"$root_out_dir/chrome_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
"$root_out_dir/icudtl.dat",
"$root_out_dir/resources.pak",
]

if (v8_use_external_startup_data) {
sources += [ "$root_out_dir/natives_blob.bin" ]
deps += [ "//v8" ]

if (use_v8_context_snapshot) {
sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
deps += [ "//tools/v8_context_snapshot" ]
} else {
sources += [ "$root_out_dir/snapshot_blob.bin" ]
}
}
}

outputs = [
"$brave_dist_dir/{{source_file_part}}"
]
Expand Down