diff options
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 22 | ||||
| -rw-r--r-- | chrome/service/cloud_print/print_system_cups.cc | 1 | ||||
| -rw-r--r-- | printing/backend/print_backend_cups.cc | 6 | ||||
| -rw-r--r-- | printing/printing.gyp | 22 |
5 files changed, 39 insertions, 14 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4d5836e..b8a31eba 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -392,7 +392,7 @@ 'NACL_WIN64', ], }], - ['OS=="linux" and chromeos==0 and target_arch!="arm"', { + ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', { 'use_cups%': 1, }, { 'use_cups%': 0, diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 961d908..b1e8ebb 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1165,12 +1165,6 @@ ], }], ['use_cups==1', { - 'link_settings': { - 'libraries': [ - '-lcups', - '-lgcrypt', - ], - }, 'defines': [ # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation # of cloud print system, and allows to use custom implementaiton. @@ -1179,6 +1173,22 @@ 'sources': [ 'service/cloud_print/print_system_cups.cc', ], + 'conditions': [ + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/usr/lib/libcups.dylib', + ] + }, + }, { + 'link_settings': { + 'libraries': [ + '-lcups', + '-lgcrypt', + ], + }, + }], + ], }], ['remoting==1', { 'dependencies': [ diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index 99e3d1d..12548af 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -7,7 +7,6 @@ #include <cups/cups.h> #include <dlfcn.h> #include <errno.h> -#include <gcrypt.h> #include <pthread.h> #include <list> diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc index 9693299..09fdf1d 100644 --- a/printing/backend/print_backend_cups.cc +++ b/printing/backend/print_backend_cups.cc @@ -6,7 +6,9 @@ #include <dlfcn.h> #include <errno.h> +#if !defined(OS_MACOSX) #include <gcrypt.h> +#endif #include <pthread.h> #include "base/file_util.h" @@ -18,6 +20,7 @@ #include "googleurl/src/gurl.h" #include "printing/backend/cups_helper.h" +#if !defined(OS_MACOSX) GCRY_THREAD_OPTION_PTHREAD_IMPL; namespace { @@ -64,6 +67,7 @@ class GcryptInitializer { }; } // namespace +#endif namespace printing { @@ -182,8 +186,10 @@ bool PrintBackendCUPS::IsValidPrinter(const std::string& printer_name) { scoped_refptr<PrintBackend> PrintBackend::CreateInstance( const DictionaryValue* print_backend_settings) { +#if !defined(OS_MACOSX) // Initialize gcrypt library. Singleton<GcryptInitializer>::get(); +#endif std::string print_server_url_str; if (print_backend_settings) { diff --git a/printing/printing.gyp b/printing/printing.gyp index ac87ab3..7acb6d7 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -112,12 +112,6 @@ ], }], ['use_cups==1', { - 'link_settings': { - 'libraries': [ - '-lcups', - '-lgcrypt', - ], - }, 'defines': [ # PRINT_BACKEND_AVAILABLE disables the default dummy implementation # of the print backend and enables a custom implementation instead. @@ -128,6 +122,22 @@ 'backend/cups_helper.h', 'backend/print_backend_cups.cc', ], + 'conditions': [ + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/usr/lib/libcups.dylib', + ] + }, + }, { + 'link_settings': { + 'libraries': [ + '-lcups', + '-lgcrypt', + ], + }, + }], + ], }], ], }, |