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

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: is_linux -> is_desktop_linux 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
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | chrome/browser/ui/libgtk2ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b0109bb7fdcf1d4da5c1eed781c6ccdd594193dd..217ac9c75dfc20b882ddd552b826d2306c102e1f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -13,6 +13,9 @@ if (is_android) {
} else {
import("//tools/grit/grit_rule.gni")
}
+if (is_desktop_linux) {
+ import("//build/config/linux/pkg_config.gni")
+}
about_credits_file = "$target_gen_dir/about_credits.html"
additional_modules_list_file =
@@ -24,6 +27,12 @@ gypi_values = exec_script(
"scope",
[ "../chrome_browser.gypi" ])
+if (is_desktop_linux) {
+ pkg_config("gnome_keyring") {
+ packages = [ "gnome-keyring-1" ]
+ }
+}
+
static_library("browser") {
configs += [
"//build/config/compiler:wexit_time_destructors",
@@ -371,7 +380,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,
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | chrome/browser/ui/libgtk2ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698