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

Side by Side Diff: build/linux/system.gyp

Issue 118047: Reverting 17273 - Fails reliability tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 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 | « no previous file | chrome/browser/browser.vcproj » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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': 'gtk', 8 'target_name': 'gtk',
9 'type': 'settings', 9 'type': 'settings',
10 'direct_dependent_settings': { 10 'direct_dependent_settings': {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 }, 133 },
134 'link_settings': { 134 'link_settings': {
135 'ldflags': [ 135 'ldflags': [
136 '<!@(pkg-config --libs-only-L --libs-only-other x11)', 136 '<!@(pkg-config --libs-only-L --libs-only-other x11)',
137 ], 137 ],
138 'libraries': [ 138 'libraries': [
139 '<!@(pkg-config --libs-only-l x11)', 139 '<!@(pkg-config --libs-only-l x11)',
140 ], 140 ],
141 }, 141 },
142 }, 142 },
143 # TODO(evanm): temporarily disabled while we figure out whether to depend
144 # on gnome-keyring etc.
145 # http://code.google.com/p/chromium/issues/detail?id=12351
146 # {
147 # 'target_name': 'gnome-keyring',
148 # 'type': 'settings',
149 # 'direct_dependent_settings': {
150 # 'cflags': [
151 # '<!@(pkg-config --cflags gnome-keyring-1)',
152 # ],
153 # },
154 # 'link_settings': {
155 # 'ldflags': [
156 # '<!@(pkg-config --libs-only-L --libs-only-other gnome-keyring-1)',
157 # ],
158 # 'libraries': [
159 # '<!@(pkg-config --libs-only-l gnome-keyring-1)',
160 # ],
161 # },
162 # },
163 # {
164 # 'target_name': 'dbus-glib',
165 # 'type': 'settings',
166 # 'direct_dependent_settings': {
167 # 'cflags': [
168 # '<!@(pkg-config --cflags dbus-glib-1)',
169 # ],
170 # },
171 # 'link_settings': {
172 # 'ldflags': [
173 # '<!@(pkg-config --libs-only-L --libs-only-other dbus-glib-1)',
174 # ],
175 # 'libraries': [
176 # '<!@(pkg-config --libs-only-l dbus-glib-1)',
177 # ],
178 # },
179 # },
180 ], 143 ],
181 } 144 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698