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

Unified Diff: printing/printing.gyp

Issue 7055003: Last gyp patch for cross-platform Unix support (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 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 | « ppapi/ppapi_tests.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing.gyp
diff --git a/printing/printing.gyp b/printing/printing.gyp
index aae1a6e2cfec3e78a42b421920e31681289d3261..f7ce898c07560f32470078eefddcfd4b63b3f5c2 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -89,7 +89,7 @@
],
},
'conditions': [
- ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{
+ ['toolkit_uses_gtk == 0',{
tony 2011/05/20 16:09:38 This one is a bit weird because the other conditio
'sources/': [['exclude', '_cairo\\.cc$']]
}],
['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
@@ -97,7 +97,7 @@
}, { # else: OS=="win"
'sources/': [['exclude', '_posix\\.cc$']]
}],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk == 1', {
'sources': [
'metafile_skia_wrapper.cc',
'metafile_skia_wrapper.h',
@@ -172,21 +172,19 @@
'units_unittest.cc',
],
'conditions': [
- ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
+ ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
}, { # else: OS=="win"
'sources/': [['exclude', '_cairo_unittest\\.cc$']]
}
],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['OS=="linux"', {
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
'conditions': [
- ['linux_use_tcmalloc==1', {
+ ['linux_use_tcmalloc == 1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
« no previous file with comments | « ppapi/ppapi_tests.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698