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

2 files changed, 37 insertions, 52 deletions

diff --git a/build/common.gypi b/build/common.gypi
index dd752ad..3228d13 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -235,9 +235,6 @@
     # (Note: this is ignored for official builds.)
     'linux_use_seccomp_sandbox%': 0,
 
-    # Set to 1 to link against libgnome-keyring instead of using dlopen().
-    'linux_link_gnome_keyring%': 0,
-
     # Set to select the Title Case versions of strings in GRD files.
     'use_titlecase_in_grd_files%': 0,
 
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index db1c756..dbd394b 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -254,55 +254,43 @@
           },
       }]]
     },
-    {
-      'target_name': 'gnome-keyring',
-      'type': 'settings',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags gnome-keyring-1)',
-        ],
-        'conditions': [
-          ['linux_link_gnome_keyring==0', {
-            'defines': ['DLOPEN_GNOME_KEYRING'],
-          }],
-        ],
-      },
-      'conditions': [
-        ['linux_link_gnome_keyring!=0', {
-          'link_settings': {
-            'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
-            ],
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
-            ],
-          },
-        }, {
-          'link_settings': {
-            'libraries': [
-              '-ldl',
-            ],
-          },
-        }],
-      ],
-    },
-    {
-      'target_name': 'dbus-glib',
-      'type': 'settings',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags dbus-glib-1)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
-        ],
-        'libraries': [
-          '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
-        ],
-      },
-    },
+# TODO(evanm): temporarily disabled while we figure out whether to depend
+# on gnome-keyring etc.
+# http://code.google.com/p/chromium/issues/detail?id=12351
+#     {
+#       'target_name': 'gnome-keyring',
+#       'type': 'settings',
+#       'direct_dependent_settings': {
+#         'cflags': [
+#           '<!@(<(pkg-config) --cflags gnome-keyring-1)',
+#         ],
+#       },
+#       'link_settings': {
+#         'ldflags': [
+#           '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+#         ],
+#         'libraries': [
+#           '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+#         ],
+#       },
+#     },
+     {
+       'target_name': 'dbus-glib',
+       'type': 'settings',
+       'direct_dependent_settings': {
+         'cflags': [
+           '<!@(<(pkg-config) --cflags dbus-glib-1)',
+         ],
+       },
+       'link_settings': {
+         'ldflags': [
+           '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
+         ],
+         'libraries': [
+           '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
+         ],
+       },
+     },
   ],
 }