Merge pull request #13688 from electron/gn-custom-sysroot

build: [gn] use libnotify from custom sysroot
This commit is contained in:
John Kleinschmidt 2018-07-17 09:22:49 -04:00 committed by GitHub
commit 3581bf0cfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,28 +7,6 @@ filenames_gypi = exec_script(
[ "filenames.gypi" ] [ "filenames.gypi" ]
) )
if (is_linux) {
# TODO: Experiment with using //tools/generate_library_loader for generating
# the libnotify loader.
copy("libnotify_headers") {
sources = [
"/usr/include/libnotify/notify.h",
"/usr/include/libnotify/notification.h",
"/usr/include/libnotify/notify-enum-types.h",
"/usr/include/libnotify/notify-features.h",
]
outputs = [ "$target_gen_dir/libnotify-copy/libnotify/{{source_file_part}}" ]
}
config("libnotify_config") {
include_dirs = [ "$target_gen_dir/libnotify-copy" ]
}
group("libnotify") {
deps = [ ":libnotify_headers" ]
public_configs = [ ":libnotify_config" ]
}
}
static_library("brightray") { static_library("brightray") {
deps = [ deps = [
"//base", "//base",
@ -52,7 +30,6 @@ static_library("brightray") {
if (is_linux) { if (is_linux) {
deps += [ deps += [
"//build/config/linux/gtk", "//build/config/linux/gtk",
":libnotify",
] ]
} }