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

Unified Diff: chrome/browser/BUILD.gn

Issue 2216313002: Move GnomeKeyringLoader to components/os_crypt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed guard Created 4 years, 4 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 | « no previous file | chrome/browser/password_manager/native_backend_gnome_x.h » ('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 5ce556531fb8dc7bccb31a573d56d978ea01d78b..95698a86703e8b8702ab90b33f341c6b63fddadc 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -18,9 +18,6 @@ if (is_android) {
} else {
import("//tools/grit/grit_rule.gni")
}
-if (is_desktop_linux) {
- import("//build/config/linux/pkg_config.gni")
-}
additional_modules_list_file =
"$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
@@ -49,25 +46,6 @@ if (is_win) {
}
}
-if (is_desktop_linux) {
- # Gnome-keyring is normally dynamically loaded. The gnome_keyring config
- # will set this up.
- pkg_config("gnome_keyring") {
- packages = [ "gnome-keyring-1" ]
- defines = [ "USE_GNOME_KEYRING" ]
- ignore_libs = true
- }
-
- # If you want to link gnome-keyring directly (use only for unit tests)
- # ADDITIONALLY add this config on top of ":gnome_keyring". pkg-config is a
- # bit slow, so prefer not to run it again. In practice, gnome-keyring's libs
- # are just itself and common gnome ones we link already, so we can get away
- # with additionally just coding the library name here.
- config("gnome_keyring_direct") {
- libs = [ "gnome-keyring" ]
- }
-}
-
# Use a static library here because many test binaries depend on this but don't
# require many files from it. This makes linking more efficient.
split_static_library("browser") {
@@ -591,7 +569,7 @@ split_static_library("browser") {
sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources,
".",
"//chrome")
- configs += [ ":gnome_keyring" ]
+ configs += [ "//components/os_crypt:gnome_keyring" ]
}
if (is_desktop_linux) {
sources += rebase_path(gypi_values.chrome_browser_libsecret_sources,
« no previous file with comments | « no previous file | chrome/browser/password_manager/native_backend_gnome_x.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698