summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 08:41:01 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 08:41:01 +0000
commit9b16e2b227bc73691b6333596d650f60cd6a5a66 (patch)
tree0bbb2f8ddf3142b235c52a6a23606a6627cf6bda /chrome/chrome_browser.gypi
parent945b604787badddd81506dcc06b6b7f045c8650e (diff)
downloadchromium_src-9b16e2b227bc73691b6333596d650f60cd6a5a66.zip
chromium_src-9b16e2b227bc73691b6333596d650f60cd6a5a66.tar.gz
chromium_src-9b16e2b227bc73691b6333596d650f60cd6a5a66.tar.bz2
Revert r49135: Linux: enable compiling GNOME Keyring and KWallet integration. Some of the bots (memory, ARM) didn't get the new package installed yet.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2763001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi14
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7acde49..fc19b62 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1797,10 +1797,12 @@
'browser/password_manager/password_store.h',
'browser/password_manager/password_store_default.cc',
'browser/password_manager/password_store_default.h',
- 'browser/password_manager/password_store_gnome.h',
- 'browser/password_manager/password_store_gnome.cc',
- 'browser/password_manager/password_store_kwallet.h',
- 'browser/password_manager/password_store_kwallet.cc',
+ # Temporarily disabled while we figure some stuff out.
+ # http://code.google.com/p/chromium/issues/detail?id=12351
+ # 'browser/password_manager/password_store_gnome.h',
+ # 'browser/password_manager/password_store_gnome.cc',
+ # 'browser/password_manager/password_store_kwallet.h',
+ # 'browser/password_manager/password_store_kwallet.cc',
'browser/password_manager/password_store_mac_internal.h',
'browser/password_manager/password_store_mac.h',
'browser/password_manager/password_store_mac.cc',
@@ -2643,7 +2645,9 @@
'dependencies': [
'../build/linux/system.gyp:dbus-glib',
'../build/linux/system.gyp:gconf',
- '../build/linux/system.gyp:gnome-keyring',
+ # Temporarily disabled while we figure some stuff out.
+ # http://code.google.com/p/chromium/issues/detail?id=12351
+ # '../build/linux/system.gyp:gnome-keyring',
'../build/linux/system.gyp:gtk',
'../build/linux/system.gyp:gtkprint',
'../build/linux/system.gyp:nss',