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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/third_party/dynamic_annotations/dynamic_annotations.gyp ('k') | build/util/build_util.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp (revision 94544)
+++ build/linux/system.gyp (working copy)
@@ -31,6 +31,7 @@
{
'target_name': 'gtk',
'type': 'settings',
+ 'toolsets': ['host', 'target'],
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -46,12 +47,27 @@
'<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
],
},
- }],
- [ 'chromeos==1', {
- 'link_settings': {
- 'libraries': [ '-lXtst' ]
- }
- }]]
+ }, {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
+ ],
+ },
+ }],
+ ['chromeos==1', {
+ 'link_settings': {
+ 'libraries': [ '-lXtst' ]
+ }
+ }],
+ ],
},
{
'target_name': 'gtkprint',
@@ -71,7 +87,8 @@
'<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'ssl',
@@ -152,7 +169,8 @@
'<!@(<(pkg-config) --libs-only-l freetype2)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'fontconfig',
@@ -172,7 +190,8 @@
'<!@(<(pkg-config) --libs-only-l fontconfig)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'gdk',
@@ -192,7 +211,8 @@
'<!@(<(pkg-config) --libs-only-l gdk-2.0)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'gconf',
@@ -215,7 +235,8 @@
'<!@(<(pkg-config) --libs-only-l gconf-2.0)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'gio',
@@ -250,11 +271,13 @@
}],
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'x11',
'type': 'settings',
+ 'toolsets': ['host', 'target'],
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
@@ -270,7 +293,21 @@
'<!@(<(pkg-config) --libs-only-l x11 xi)',
],
},
- }],
+ }, {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags x11)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l x11 xi)',
+ ],
+ },
+ }],
],
},
{
@@ -291,7 +328,8 @@
'<!@(<(pkg-config) --libs-only-l xext)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'libgcrypt',
@@ -308,7 +346,8 @@
'<!@(libgcrypt-config --libs)',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'selinux',
@@ -320,7 +359,8 @@
'-lselinux',
],
},
- }]]
+ }],
+ ],
},
{
'target_name': 'gnome_keyring',
« no previous file with comments | « base/third_party/dynamic_annotations/dynamic_annotations.gyp ('k') | build/util/build_util.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698