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

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

Issue 7550002: Clean up SSL false start blacklist code. Numerous changes, including: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 13 matching lines...) Expand all
24 'use_system_ssl%': 1, 24 'use_system_ssl%': 1,
25 }, 25 },
26 }], 26 }],
27 ], 27 ],
28 28
29 29
30 'targets': [ 30 'targets': [
31 { 31 {
32 'target_name': 'gtk', 32 'target_name': 'gtk',
33 'type': 'settings', 33 'type': 'settings',
34 'toolsets': ['host', 'target'],
34 'conditions': [ 35 'conditions': [
35 ['_toolset=="target"', { 36 ['_toolset=="target"', {
36 'direct_dependent_settings': { 37 'direct_dependent_settings': {
37 'cflags': [ 38 'cflags': [
38 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)', 39 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
39 ], 40 ],
40 }, 41 },
41 'link_settings': { 42 'link_settings': {
42 'ldflags': [ 43 'ldflags': [
43 '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthrea d-2.0)', 44 '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthrea d-2.0)',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 '-ldl', 249 '-ldl',
249 ], 250 ],
250 }], 251 }],
251 ], 252 ],
252 }, 253 },
253 }]] 254 }]]
254 }, 255 },
255 { 256 {
256 'target_name': 'x11', 257 'target_name': 'x11',
257 'type': 'settings', 258 'type': 'settings',
259 'toolsets': ['host', 'target'],
258 'conditions': [ 260 'conditions': [
259 ['_toolset=="target"', { 261 ['_toolset=="target"', {
260 'direct_dependent_settings': { 262 'direct_dependent_settings': {
261 'cflags': [ 263 'cflags': [
262 '<!@(<(pkg-config) --cflags x11)', 264 '<!@(<(pkg-config) --cflags x11)',
263 ], 265 ],
264 }, 266 },
265 'link_settings': { 267 'link_settings': {
266 'ldflags': [ 268 'ldflags': [
267 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)', 269 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 ], 484 ],
483 'libraries': [ 485 'libraries': [
484 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)', 486 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)',
485 ], 487 ],
486 }, 488 },
487 }], 489 }],
488 ], 490 ],
489 }, 491 },
490 ], 492 ],
491 } 493 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698