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

build: [gn] fix linking against base_static (#13810)

Browse source 
* build: [gn] fix linking against base_static

* chore: run 'gn format' over brightray/BUILD.gn
This commit is contained in:
Jeremy Apthorp 2018-07-26 08:30:37 -07:00 committed by Charles Kerr
parent acbabc7635
commit 7ed9a88277
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BUILD.gn
View file

@ -178,6 +178,8 @@ static_library("electron_lib") {
"brightray", "brightray",
"build/node", "build/node",
"native_mate", "native_mate",
"//base",
"//base:i18n",
"//chrome/common:constants", "//chrome/common:constants",
"//components/cdm/renderer", "//components/cdm/renderer",
"//components/network_session_configurator/common", "//components/network_session_configurator/common",
@ -440,8 +442,6 @@ if (is_mac) {
framework_contents = [ "Resources" ] framework_contents = [ "Resources" ]
public_deps = [ ":electron_lib" ] public_deps = [ ":electron_lib" ]
deps = [ deps = [
"//base",
"//base:i18n",
":electron_framework_resources", ":electron_framework_resources",
":electron_xibs", ":electron_xibs",
] ]

18
brightray/BUILD.gn
View file

@ -1,15 +1,14 @@
import("//build/config/ui.gni") import("//build/config/ui.gni")
filenames_gypi = exec_script( filenames_gypi = exec_script("//build/gypi_to_gn.py",
"//build/gypi_to_gn.py",
[ rebase_path("filenames.gypi") ], [ rebase_path("filenames.gypi") ],
"scope", "scope",
[ "filenames.gypi" ] [ "filenames.gypi" ])
)
static_library("brightray") { static_library("brightray") {
deps = [ deps = [
"//base", "//base",
"//base:base_static",
"//components/network_session_configurator/common", "//components/network_session_configurator/common",
"//components/prefs", "//components/prefs",
"//content/public/browser", "//content/public/browser",
@ -19,9 +18,7 @@ static_library("brightray") {
"//ui/views", "//ui/views",
] ]
include_dirs = [ include_dirs = [ ".." ]
"..",
]
defines = [ defines = [
"DISABLE_NACL=1", "DISABLE_NACL=1",
@ -29,9 +26,7 @@ static_library("brightray") {
] ]
if (is_linux) { if (is_linux) {
deps += [ deps += [ "//build/config/linux/gtk" ]
"//build/config/linux/gtk",
]
} }
extra_source_filters = [] extra_source_filters = []
@ -43,7 +38,8 @@ static_library("brightray") {
] ]
} }
set_sources_assignment_filter(sources_assignment_filter + extra_source_filters) set_sources_assignment_filter(
sources_assignment_filter + extra_source_filters)
sources = filenames_gypi.brightray_sources sources = filenames_gypi.brightray_sources
set_sources_assignment_filter(sources_assignment_filter) set_sources_assignment_filter(sources_assignment_filter)
} }