diff options
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
| -rw-r--r-- | jingle/jingle.gyp | 6 | ||||
| -rw-r--r-- | sync/notifier/invalidator_registrar_unittest.cc | 2 | ||||
| -rw-r--r-- | sync/sync.gyp | 35 | ||||
| -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 |
8 files changed, 24 insertions, 41 deletions
@@ -450,13 +450,10 @@ deps_os = { "src/third_party/hunspell": None, "src/third_party/leveldatabase/src": None, "src/third_party/libexif/sources": None, - "src/third_party/libjingle/source": None, "src/third_party/libjpeg_turbo": None, "src/third_party/libphonenumber/src/phonenumbers": None, "src/third_party/libphonenumber/src/test": None, "src/third_party/libphonenumber/src/resources": None, - "src/third_party/jsoncpp/source/include": None, - "src/third_party/jsoncpp/source/src/lib_json": None, "src/third_party/libsrtp": None, "src/third_party/libvpx": None, "src/third_party/libyuv": None, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index fceaadae..16922ed 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -46,6 +46,7 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libxml/libxml.gyp:libxml', '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', @@ -2251,7 +2252,6 @@ '../third_party/expat/expat.gyp:expat', '../third_party/hunspell/hunspell.gyp:hunspell', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../third_party/libusb/libusb.gyp:libusb', '../third_party/npapi/npapi.gyp:npapi', diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 8b64fe5..0fd9811 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -7,7 +7,7 @@ 'chromium_code': 1, }, # variables 'conditions': [ - ['enable_webrtc==1 or (OS != "ios" and OS != "android")', { + ['enable_webrtc==1 or OS!="android"', { 'targets': [ # A library of various utils for integration with libjingle. { @@ -213,9 +213,9 @@ ], }, ], - }, { # enable_webrtc != 1 and (OS == "ios" or OS == "android") + }, { # enable_webrtc!=1 and OS=="android" 'targets': [ - # Stub targets as iOS/Android don't use libjingle when webrtc is disabled. + # Stub targets as Android doesn't use libjingle when webrtc is disabled. { 'target_name': 'jingle_glue', 'type': 'none', diff --git a/sync/notifier/invalidator_registrar_unittest.cc b/sync/notifier/invalidator_registrar_unittest.cc index 4d5df6c..00f04e2 100644 --- a/sync/notifier/invalidator_registrar_unittest.cc +++ b/sync/notifier/invalidator_registrar_unittest.cc @@ -130,6 +130,7 @@ class InvalidatorRegistrarTest : public testing::Test {}; // When we expect a death via CHECK(), we can't match against the // CHECK() message since they are removed in official builds. +#if GTEST_HAS_DEATH_TEST // Having registered handlers on destruction should cause a CHECK. TEST_F(InvalidatorRegistrarTest, RegisteredHandlerOnDestruction) { scoped_ptr<InvalidatorRegistrar> registrar(new InvalidatorRegistrar()); @@ -168,6 +169,7 @@ TEST_F(InvalidatorRegistrarTest, MultipleRegistration) { registrar.UnregisterHandler(&handler2); registrar.UnregisterHandler(&handler1); } +#endif // GTEST_HAS_DEATH_TEST } // namespace diff --git a/sync/sync.gyp b/sync/sync.gyp index 144d6b9..17201cd 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -218,6 +218,7 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', # TODO(akalin): Remove this (http://crbug.com/133352). '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', + '../third_party/libjingle/libjingle.gyp:libjingle', 'sync_core', ], 'export_dependent_settings': [ @@ -241,12 +242,7 @@ 'notifier/object_id_invalidation_map.h', ], 'conditions': [ - ['OS == "ios"', { - 'sources!': [ - 'notifier/invalidator_factory.cc', - ], - }], - ['OS != "android" and OS != "ios"', { + ['OS != "android"', { 'sources': [ 'notifier/ack_tracker.cc', 'notifier/ack_tracker.h', @@ -267,11 +263,6 @@ 'notifier/sync_system_resources.h', ], }], - ['OS != "ios"', { - 'dependencies': [ - '../third_party/libjingle/libjingle.gyp:libjingle', - ], - }], ], }, # The sync internal API library. @@ -761,6 +752,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + '../third_party/libjingle/libjingle.gyp:libjingle', 'sync_core', 'sync_notifier', 'test_support_sync_notifier', @@ -774,6 +766,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + '../third_party/libjingle/libjingle.gyp:libjingle', 'sync_core', 'sync_notifier', 'test_support_sync_notifier', @@ -786,15 +779,7 @@ 'notifier/invalidator_factory_unittest.cc', ], 'conditions': [ - ['OS == "ios"', { - 'sources!': [ - # TODO(ios): Re-enable this test on iOS once there is an iOS - # implementation of invalidator_factory. - 'notifier/invalidator_factory_unittest.cc', - 'notifier/sync_notifier_factory_unittest.cc', - ], - }], - ['OS != "android" and OS != "ios"', { + ['OS != "android"', { 'sources': [ 'notifier/ack_tracker_unittest.cc', 'notifier/fake_invalidator_unittest.cc', @@ -810,16 +795,6 @@ }], ], }, - 'conditions': [ - ['OS != "ios"', { - 'dependencies': [ - '../third_party/libjingle/libjingle.gyp:libjingle', - ], - 'export_dependent_settings': [ - '../third_party/libjingle/libjingle.gyp:libjingle', - ], - }], - ], }, # Unit tests for the 'sync_internal_api' target. This cannot be a static 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)) { |