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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 7054041: Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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') | chrome/chrome_common.gypi » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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': 'static_library', 9 'type': 'static_library',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 3649 matching lines...) Expand 10 before | Expand all | Expand 10 after
3660 ['exclude', '^browser/chromeos/input_method/candidate_window.cc'], 3660 ['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
3661 ['exclude', '^browser/chromeos/input_method/candidate_window.h'], 3661 ['exclude', '^browser/chromeos/input_method/candidate_window.h'],
3662 ], 3662 ],
3663 }], 3663 }],
3664 ['toolkit_uses_gtk == 1', { 3664 ['toolkit_uses_gtk == 1', {
3665 'dependencies': [ 3665 'dependencies': [
3666 '../build/linux/system.gyp:dbus-glib', 3666 '../build/linux/system.gyp:dbus-glib',
3667 '../build/linux/system.gyp:gconf', 3667 '../build/linux/system.gyp:gconf',
3668 '../build/linux/system.gyp:gtk', 3668 '../build/linux/system.gyp:gtk',
3669 '../build/linux/system.gyp:gtkprint', 3669 '../build/linux/system.gyp:gtkprint',
3670 '../build/linux/system.gyp:ssl', 3670 '../build/linux/system.gyp:nss',
3671 '../build/linux/system.gyp:x11', 3671 '../build/linux/system.gyp:x11',
3672 '../third_party/undoview/undoview.gyp:undoview', 3672 '../third_party/undoview/undoview.gyp:undoview',
3673 ], 3673 ],
3674 'link_settings': { 3674 'link_settings': {
3675 'libraries': [ 3675 'libraries': [
3676 # For dlsym() in 'browser/zygote_main_linux.cc' 3676 # For dlsym() in 'browser/zygote_main_linux.cc'
3677 '-ldl', 3677 '-ldl',
3678 ], 3678 ],
3679 }, 3679 },
3680 'sources!': [ 3680 'sources!': [
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
4622 'hard_dependency': 1, 4622 'hard_dependency': 1,
4623 }, 4623 },
4624 ], 4624 ],
4625 } 4625 }
4626 4626
4627 # Local Variables: 4627 # Local Variables:
4628 # tab-width:2 4628 # tab-width:2
4629 # indent-tabs-mode:nil 4629 # indent-tabs-mode:nil
4630 # End: 4630 # End:
4631 # vim: set expandtab tabstop=2 shiftwidth=2: 4631 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698