diff options
Diffstat (limited to 'chromium/printing/printing.gyp')
| -rw-r--r-- | chromium/printing/printing.gyp | 77 |
1 files changed, 17 insertions, 60 deletions
diff --git a/chromium/printing/printing.gyp b/chromium/printing/printing.gyp index 3371745545e..bfec0fc450a 100644 --- a/chromium/printing/printing.gyp +++ b/chromium/printing/printing.gyp @@ -18,7 +18,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../ui/gfx/gfx.gyp:gfx', - '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', + '../ui/gfx/gfx.gyp:gfx_geometry', '../url/url.gyp:url_lib', ], 'defines': [ @@ -53,7 +53,6 @@ 'page_range.h', 'page_setup.cc', 'page_setup.h', - 'page_size_margins.cc', 'page_size_margins.h', 'pdf_metafile_cg_mac.cc', 'pdf_metafile_cg_mac.h', @@ -61,23 +60,20 @@ 'pdf_metafile_skia.h', 'print_destination_interface.h', 'print_destination_none.cc', - 'print_destination_win.cc', 'print_dialog_gtk_interface.h', 'print_job_constants.cc', 'print_job_constants.h', 'print_settings.cc', 'print_settings.h', - 'print_settings_initializer.cc', - 'print_settings_initializer.h', - 'print_settings_initializer_gtk.cc', - 'print_settings_initializer_gtk.h', + 'print_settings_conversion.cc', + 'print_settings_conversion.h', 'print_settings_initializer_mac.cc', 'print_settings_initializer_mac.h', 'print_settings_initializer_win.cc', 'print_settings_initializer_win.h', 'printed_document.cc', 'printed_document.h', - 'printed_document_gtk.cc', + 'printed_document_linux.cc', 'printed_document_mac.cc', 'printed_document_win.cc', 'printed_page.cc', @@ -100,22 +96,6 @@ 'dependencies': [ '<(DEPTH)/ui/aura/aura.gyp:aura', ], - }], - ['toolkit_uses_gtk == 0',{ - 'sources/': [['exclude', '_cairo\\.cc$']] - }], - ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}], - ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']] - }, { # else: OS=="win" - 'sources/': [['exclude', '_posix\\.cc$']] - }], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - # For FT_Init_FreeType and friends. - '../build/linux/system.gyp:freetype2', - '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:gtkprint', - ], }], # Mac-Aura does not support printing. ['OS=="mac" and use_aura==1',{ @@ -133,14 +113,8 @@ }], ['OS=="win"', { 'dependencies': [ - '../win8/win8.gyp:win8_util', + '<(DEPTH)/ui/aura/aura.gyp:aura', ], - 'conditions': [ - ['use_aura==1', { - 'dependencies': [ - '<(DEPTH)/ui/aura/aura.gyp:aura', - ], - }]], 'defines': [ # PRINT_BACKEND_AVAILABLE disables the default dummy implementation # of the print backend and enables a custom implementation instead. @@ -153,11 +127,8 @@ 'printing_context_win.cc', 'printing_context_win.h', ], - 'sources!': [ - 'print_destination_none.cc', - ], }], - ['chromeos==1 or (use_aura==1 and OS!="win")',{ + ['chromeos==1',{ 'sources': [ 'printing_context_no_system_dialog.cc', 'printing_context_no_system_dialog.h', @@ -171,11 +142,6 @@ 'cups_version': '<!(cups-config --api-version)', }, 'conditions': [ - ['OS!="mac"', { - 'dependencies': [ - '../build/linux/system.gyp:libgcrypt', - ], - }], ['cups_version in ["1.6", "1.7"]', { 'cflags': [ # CUPS 1.6 deprecated the PPD APIs, but we will stay with this @@ -221,10 +187,10 @@ 'backend/print_backend_chromeos.cc', ], }], - ['toolkit_uses_gtk==1 and chromeos==0', { + ['OS=="linux" and chromeos==0', { 'sources': [ - 'printing_context_gtk.cc', - 'printing_context_gtk.h', + 'printing_context_linux.cc', + 'printing_context_linux.h', ], }], ['OS=="android"', { @@ -232,11 +198,8 @@ 'printing_context_android.cc', 'printing_context_android.h', ], - 'dependencies': [ - 'printing_jni_headers', - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/printing', + 'dependencies': [ + 'printing_jni_headers', ], }], ], @@ -245,12 +208,13 @@ 'target_name': 'printing_unittests', 'type': 'executable', 'dependencies': [ - 'printing', - '../testing/gtest.gyp:gtest', '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', + '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', + '../ui/gfx/gfx.gyp:gfx_geometry', + 'printing', ], 'sources': [ 'emf_win_unittest.cc', @@ -265,7 +229,6 @@ 'units_unittest.cc', ], 'conditions': [ - ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}], ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}], ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]}], ['use_cups==1', { @@ -276,14 +239,9 @@ 'backend/cups_helper_unittest.cc', ], }], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }], [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 'conditions': [ - ['linux_use_tcmalloc == 1', { + ['use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -317,7 +275,7 @@ ], }, }], - [ 'os_bsd==1', { + ['os_bsd==1', { 'cflags': [ '<!@(python cups_config_helper.py --cflags)', ], @@ -339,7 +297,6 @@ ], 'variables': { 'jni_gen_package': 'printing', - 'jni_generator_ptr_type': 'long', }, 'includes': [ '../build/jni_generator.gypi' ], }, |