Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/browser/BUILD.gn

Issue 655343002: GN: Move configs for single-use Linux packages close to usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b0109bb7fdcf1d4da5c1eed781c6ccdd594193dd..d197296b16ab4fb6db8ec04f3de498ec3368206a 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4,6 +4,7 @@
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
@@ -24,6 +25,10 @@ gypi_values = exec_script(
"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)
Chris Masone 2014/10/15 22:52:50 Done.
+ packages = [ "gnome-keyring-1" ]
+}
+
static_library("browser") {
configs += [
"//build/config/compiler:wexit_time_destructors",
@@ -371,7 +376,7 @@ static_library("browser") {
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,

Powered by Google App Engine
This is Rietveld 408576698