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

Unified Diff: printing/printing.gyp

Issue 193086: Fix printing project on linux. (Closed)
Patch Set: fix git error Created 11 years, 3 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 | « printing/printed_document.cc ('k') | printing/run_all_unittests.cc » ('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 c10b92b4ed9e8aeffcbde814cc87a20deec161bf..c6340ecf03c18dc20da7a27fe32338c120f339ea 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -51,7 +51,7 @@
'printed_pages_source.h',
'printing_context.h',
'printing_context_linux.cc',
- 'printing_context_mac.cc',
+ 'printing_context_mac.cc',
'printing_context_win.cc',
'units.cc',
'units.h',
@@ -64,15 +64,9 @@
'conditions': [
['OS!="linux"', {'sources/': [['exclude', '_linux\\.cc$']]}],
['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
- ['OS!="win"', {
- 'sources/': [
- ['exclude', '_win\\.cc$'],
- ['exclude',
- 'printed_document.cc',
- ]
- ]
- }, { # else: OS=="win"
- 'sources/': [['exclude', '_posix\\.cc$']]
+ ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']]
+ }, { # else: OS=="win"
+ 'sources/': [['exclude', '_posix\\.cc$']]
}],
],
},
@@ -100,26 +94,16 @@
'conditions': [
['OS!="linux"', {'sources/': [['exclude', '_linux_unittest\\.cc$']]}],
['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
- ['OS!="win"', {
- 'sources/': [
- ['exclude', '_win_unittest\\.cc$'],
-
- # Most of the printing functionailty is Windows only for now.
- ['exclude', '.*'],
- ['include', 'page_range_unittest.cc'],
- ['include', 'page_setup_unittest.cc'],
- ['include', 'units_unittest.cc'],
- ]
- }, { # else: OS=="win"
- 'sources/': [['exclude', '_posix_unittest\\.cc$']]
- }],
+ ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
+ }, { # else: OS=="win"
+ 'sources/': [['exclude', '_posix_unittest\\.cc$']]
+ }
+ ],
['OS=="linux"', {
- 'dependencies': [
- '../base/base.gyp:base_gfx',
- ],
- 'sources/': [
- ['include', 'pdf_ps_metafile_linux_unittest.cc'],
- ]
+ 'dependencies': [
+ '../build/linux/system.gyp:fontconfig',
+ '../build/linux/system.gyp:gtk',
+ ],
}],
],
},
« no previous file with comments | « printing/printed_document.cc ('k') | printing/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698