Chromium Code Reviews| Index: printing/printing.gyp |
| diff --git a/printing/printing.gyp b/printing/printing.gyp |
| index 7d02e609965fc0bfb2cfb9a2a253a77d6a292838..37153de20fba81dff64515b2177a8f2c39617929 100644 |
| --- a/printing/printing.gyp |
| +++ b/printing/printing.gyp |
| @@ -87,6 +87,11 @@ |
| ], |
| }, |
| 'conditions': [ |
| + ['enable_printing!=1', { |
| + 'sources/': [ |
| + ['exclude', '.'], |
| + ], |
| + }], |
| ['toolkit_uses_gtk == 0',{ |
| 'sources/': [['exclude', '_cairo\\.cc$']] |
| }], |
| @@ -209,6 +214,12 @@ |
| 'units_unittest.cc', |
| ], |
| 'conditions': [ |
| + ['enable_printing!=1', { |
| + 'sources/': [ |
| + ['exclude', '.'], |
| + ['include', 'run_all_unittests.cc'], |
| + ], |
| + }], |
| ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}], |
| ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}], |
| ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]}], |
| @@ -235,7 +246,7 @@ |
| 'target_name': 'cups', |
| 'type': 'none', |
| 'conditions': [ |
| - ['use_cups==1', { |
| + ['use_cups==1 and enable_printing==1', { |
|
Lei Zhang
2012/06/08 19:08:41
I don't think you need this. |use_cups| is already
Xianzhu
2012/06/08 22:50:43
Done.
|
| 'direct_dependent_settings': { |
| 'defines': [ |
| 'USE_CUPS', |