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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 2763001: Revert r49135: Linux: enable compiling GNOME Keyring and KWallet integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 'browser/password_manager/login_database.cc', 1790 'browser/password_manager/login_database.cc',
1791 'browser/password_manager/login_database.h', 1791 'browser/password_manager/login_database.h',
1792 'browser/password_manager/password_form_manager.cc', 1792 'browser/password_manager/password_form_manager.cc',
1793 'browser/password_manager/password_form_manager.h', 1793 'browser/password_manager/password_form_manager.h',
1794 'browser/password_manager/password_manager.cc', 1794 'browser/password_manager/password_manager.cc',
1795 'browser/password_manager/password_manager.h', 1795 'browser/password_manager/password_manager.h',
1796 'browser/password_manager/password_store.cc', 1796 'browser/password_manager/password_store.cc',
1797 'browser/password_manager/password_store.h', 1797 'browser/password_manager/password_store.h',
1798 'browser/password_manager/password_store_default.cc', 1798 'browser/password_manager/password_store_default.cc',
1799 'browser/password_manager/password_store_default.h', 1799 'browser/password_manager/password_store_default.h',
1800 'browser/password_manager/password_store_gnome.h', 1800 # Temporarily disabled while we figure some stuff out.
1801 'browser/password_manager/password_store_gnome.cc', 1801 # http://code.google.com/p/chromium/issues/detail?id=12351
1802 'browser/password_manager/password_store_kwallet.h', 1802 # 'browser/password_manager/password_store_gnome.h',
1803 'browser/password_manager/password_store_kwallet.cc', 1803 # 'browser/password_manager/password_store_gnome.cc',
1804 # 'browser/password_manager/password_store_kwallet.h',
1805 # 'browser/password_manager/password_store_kwallet.cc',
1804 'browser/password_manager/password_store_mac_internal.h', 1806 'browser/password_manager/password_store_mac_internal.h',
1805 'browser/password_manager/password_store_mac.h', 1807 'browser/password_manager/password_store_mac.h',
1806 'browser/password_manager/password_store_mac.cc', 1808 'browser/password_manager/password_store_mac.cc',
1807 'browser/password_manager/password_store_win.h', 1809 'browser/password_manager/password_store_win.h',
1808 'browser/password_manager/password_store_win.cc', 1810 'browser/password_manager/password_store_win.cc',
1809 'browser/platform_util.h', 1811 'browser/platform_util.h',
1810 'browser/platform_util_linux.cc', 1812 'browser/platform_util_linux.cc',
1811 'browser/platform_util_chromeos.cc', 1813 'browser/platform_util_chromeos.cc',
1812 'browser/platform_util_common_linux.cc', 1814 'browser/platform_util_common_linux.cc',
1813 'browser/platform_util_mac.mm', 1815 'browser/platform_util_mac.mm',
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
2636 'link_settings': { 2638 'link_settings': {
2637 'libraries': [ 2639 'libraries': [
2638 '-lpulse', 2640 '-lpulse',
2639 ], 2641 ],
2640 }, 2642 },
2641 }], 2643 }],
2642 ['OS=="linux"', { 2644 ['OS=="linux"', {
2643 'dependencies': [ 2645 'dependencies': [
2644 '../build/linux/system.gyp:dbus-glib', 2646 '../build/linux/system.gyp:dbus-glib',
2645 '../build/linux/system.gyp:gconf', 2647 '../build/linux/system.gyp:gconf',
2646 '../build/linux/system.gyp:gnome-keyring', 2648 # Temporarily disabled while we figure some stuff out.
2649 # http://code.google.com/p/chromium/issues/detail?id=12351
2650 # '../build/linux/system.gyp:gnome-keyring',
2647 '../build/linux/system.gyp:gtk', 2651 '../build/linux/system.gyp:gtk',
2648 '../build/linux/system.gyp:gtkprint', 2652 '../build/linux/system.gyp:gtkprint',
2649 '../build/linux/system.gyp:nss', 2653 '../build/linux/system.gyp:nss',
2650 ], 2654 ],
2651 'link_settings': { 2655 'link_settings': {
2652 'libraries': [ 2656 'libraries': [
2653 # For dlsym() in 'browser/zygote_main_linux.cc' 2657 # For dlsym() in 'browser/zygote_main_linux.cc'
2654 '-ldl', 2658 '-ldl',
2655 ], 2659 ],
2656 }, 2660 },
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
3582 ], 3586 ],
3583 }, 3587 },
3584 ], 3588 ],
3585 } 3589 }
3586 3590
3587 # Local Variables: 3591 # Local Variables:
3588 # tab-width:2 3592 # tab-width:2
3589 # indent-tabs-mode:nil 3593 # indent-tabs-mode:nil
3590 # End: 3594 # End:
3591 # vim: set expandtab tabstop=2 shiftwidth=2: 3595 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698