Browse Source

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

* build: [gn] fix linking against base_static

* chore: run 'gn format' over brightray/BUILD.gn
Jeremy Apthorp 6 years ago
parent
commit
7ed9a88277
2 changed files with 11 additions and 15 deletions
  1. 2 2
      BUILD.gn
  2. 9 13
      brightray/BUILD.gn

+ 2 - 2
BUILD.gn

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

+ 9 - 13
brightray/BUILD.gn

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