GN: Move configs for single-use Linux packages close to usage

chrome/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
+import("//build/config/linux/pkg_config.gni")

[jamesr, 2014/10/15 22:46:21]

should only import this on linux

[Chris Masone, 2014/10/15 22:52:50]

Done.

 import("//build/config/ui.gni")
 import("//components/nacl/nacl_defines.gni")
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
 # produces a conflict for the "grit" template so we have to only include one.
 if (is_android) {
   import("//build/config/android/rules.gni")
 } else {
   import("//tools/grit/grit_rule.gni")
 }
 
 about_credits_file = "$target_gen_dir/about_credits.html"
 additional_modules_list_file =
     "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("../chrome_browser.gypi") ],
     "scope",
     [ "../chrome_browser.gypi" ])
 
+pkg_config("gnome_keyring") {

[jamesr, 2014/10/15 22:46:20]

i think this should be in an if (is_desktop_linux) block

[Chris Masone, 2014/10/15 22:52:50]

Done.

+  packages = [ "gnome-keyring-1" ]
+}
+
 static_library("browser") {
   configs += [
     "//build/config/compiler:wexit_time_destructors",
     "//third_party/WebKit/public:debug_devtools",
   ]
   defines = []
   sources = []
   libs = []
   ldflags = []
 
@@ skipping 327 matching lines @@
       "metrics/signin_status_metrics_provider.h",
     ]
   }
 
   if (use_cups) {
     configs += [ "//printing:cups" ]
   }
   if (is_desktop_linux) {
     sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources,
                            ".", "//chrome")
-    configs += [ "//build/config/linux:gnome_keyring" ]
+    configs += [ ":gnome_keyring" ]
   }
   if (use_aura) {
     sources += rebase_path(gypi_values.chrome_browser_aura_sources,
                            ".", "//chrome")
     deps += [
       "//ui/aura",
       "//ui/compositor",
       "//ui/keyboard",
     ]
   }
@@ skipping 547 matching lines @@
     ]
   }
 
   if (enable_wifi_bootstrapping) {
     sources += [
       "local_discovery/wifi/mock_wifi_manager.cc",
       "local_discovery/wifi/mock_wifi_manager.h",
     ]
   }
 }