mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: [gn] move crashpad to mac-only

Browse source
This commit is contained in:
Jeremy Apthorp 2018-06-29 13:39:22 -07:00
parent 1e1adef9b6
commit 62f62264da
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
BUILD.gn
View file

@ -223,7 +223,6 @@ static_library("electron_lib") {
"//skia", "//skia",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
"//third_party/boringssl", "//third_party/boringssl",
"//third_party/crashpad/crashpad/client",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/libyuv", "//third_party/libyuv",
"//ui/events:dom_keycode_converter", "//ui/events:dom_keycode_converter",
@ -244,6 +243,13 @@ static_library("electron_lib") {
if (is_mac) { if (is_mac) {
deps += [ deps += [
"//ui/accelerated_widget_mac", "//ui/accelerated_widget_mac",
"//third_party/crashpad/crashpad/client",
]
include_dirs += [
# NOTE(nornagon): other chromium files use the full path to include
# crashpad; this is just here for compatibility between GN and GYP, so that
# the #includes can be agnostic about where crashpad is vendored.
"//third_party/crashpad",
] ]
} }
if (is_linux) { if (is_linux) {
@ -251,7 +257,6 @@ static_library("electron_lib") {
"//build/config/linux/gtk3", "//build/config/linux/gtk3",
"//chrome/browser/ui/libgtkui", "//chrome/browser/ui/libgtkui",
"//device/bluetooth", "//device/bluetooth",
"//third_party/breakpad:client",
"//ui/events/devices/x11", "//ui/events/devices/x11",
"//ui/events/platform/x11", "//ui/events/platform/x11",
"//ui/native_theme", "//ui/native_theme",
@ -260,11 +265,6 @@ static_library("electron_lib") {
] ]
configs += [ ":gio_unix" ] configs += [ ":gio_unix" ]
} }
if (is_win) {
deps += [
"//third_party/breakpad:client",
]
}
defines = [ defines = [
# Disable warnings for g_settings_list_schemas. # Disable warnings for g_settings_list_schemas.
"GLIB_DISABLE_DEPRECATION_WARNINGS", "GLIB_DISABLE_DEPRECATION_WARNINGS",
@ -281,12 +281,9 @@ static_library("electron_lib") {
# TODO(nornagon): replace usage of SchemeRegistry by an actually exported # TODO(nornagon): replace usage of SchemeRegistry by an actually exported
# API of blink, then delete this include dir. # API of blink, then delete this include dir.
"//third_party/WebKit/Source", "//third_party/WebKit/Source",
# NOTE(nornagon): other chromium files use the full path to include
# crashpad; this is just here for compatibility between GN and GYP, so that
# the #includes can be agnostic about where crashpad is vendored.
"//third_party/crashpad",
] ]
if (is_linux || is_win) { if (is_linux || is_win) {
deps += [ "//third_party/breakpad:client" ]
include_dirs += [ include_dirs += [
"//third_party/breakpad", "//third_party/breakpad",
] ]