diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
| commit | 6040af94afce8f5953b8c19c5258a6d8be122152 (patch) | |
| tree | 4b5ac1a229555694d24103633386b192d8132594 /third_party | |
| parent | ea91a2bf8536adfed57c70d56df741dbd8aeb8d2 (diff) | |
| download | chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.zip chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.gz chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.bz2 | |
Makes the necessary changes to sync.gyp as well as its dependencies (most notably jingle) in order to bring up the complete sync_notifier target on iOS.
TBR=thakis
Review URL: https://chromiumcodereview.appspot.com/12041016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/expat/expat.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 7 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/logging.cc | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index 575a00c..5f1657c 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -7,7 +7,7 @@ 'conditions': [ # On Linux, we implicitly already depend on expat via fontconfig; # let's not pull it in twice. - ['os_posix == 1 and OS != "mac" and OS != "android"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 'use_system_expat%': 1, }, { 'use_system_expat%': 0, diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 733297d..5f78e14 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -190,6 +190,11 @@ 'OSX', ], }], + ['OS=="ios"', { + 'defines': [ + 'IOS', + ], + }], ['os_posix == 1', { 'defines': [ 'POSIX', @@ -447,7 +452,7 @@ '<(libjingle_source)/talk/base/linux.h', ], }], - ['OS=="mac"', { + ['OS=="mac" or OS=="ios"', { 'sources': [ '<(libjingle_source)/talk/base/macconversion.cc', '<(libjingle_source)/talk/base/macconversion.h', diff --git a/third_party/libjingle/overrides/talk/base/logging.cc b/third_party/libjingle/overrides/talk/base/logging.cc index 72e24e3..d9c0702 100644 --- a/third_party/libjingle/overrides/talk/base/logging.cc +++ b/third_party/libjingle/overrides/talk/base/logging.cc @@ -4,7 +4,7 @@ #include "third_party/libjingle/overrides/talk/base/logging.h" -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) #include <CoreServices/CoreServices.h> #endif // OS_MACOSX @@ -86,7 +86,11 @@ static std::string GenerateExtra(LogErrorContext err_ctx, break; } #endif // OS_WIN -#if defined(OS_MACOSX) +#if defined(OS_IOS) + case ERRCTX_OSSTATUS: + tmp << " " << "Unknown LibJingle error: " << err; + break; +#elif defined(OS_MACOSX) case ERRCTX_OSSTATUS: { tmp << " " << nonnull(GetMacOSStatusErrorString(err), "Unknown error"); if (const char* desc = GetMacOSStatusCommentString(err)) { |