diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 16:57:03 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 16:57:03 +0000 |
| commit | 6de751f7caa908c996e0bd61cfaeecea8b6459b1 (patch) | |
| tree | a7c52b13b3967953f7b954d69789cf6fab6a6f75 /jingle/jingle.gyp | |
| parent | abd08d0adcfa37c35033a5cefc41f9b9ed6a4934 (diff) | |
| download | chromium_src-6de751f7caa908c996e0bd61cfaeecea8b6459b1.zip chromium_src-6de751f7caa908c996e0bd61cfaeecea8b6459b1.tar.gz chromium_src-6de751f7caa908c996e0bd61cfaeecea8b6459b1.tar.bz2 | |
Add JingleThreadWrapper.
JingleThreadWrapper wraps chromium thread with a talk_base::Thread interface.
BUG=None
TEST=Unittests
Review URL: http://codereview.chromium.org/6747017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
| -rw-r--r-- | jingle/jingle.gyp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 7077884..1a50938 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -7,6 +7,22 @@ 'chromium_code': 1, }, # variables 'targets': [ + # A library of various utils for integration with libjingle. + { + 'target_name': 'jingle_glue', + 'type': '<(library)', + 'sources': [ + 'glue/thread_wrapper.cc', + 'glue/thread_wrapper.h', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../third_party/libjingle/libjingle.gyp:libjingle', + ], + 'export_dependent_settings': [ + '../third_party/libjingle/libjingle.gyp:libjingle', + ], + }, # A library for sending and receiving peer-issued notifications. # # TODO(akalin): Separate out the XMPP stuff from this library into @@ -103,11 +119,10 @@ ], }, { - 'target_name': 'notifier_unit_tests', + 'target_name': 'jingle_unittests', 'type': 'executable', 'sources': [ - # TODO(akalin): Write our own test suite and runner. - '../base/test/run_all_unittests.cc', + 'glue/thread_wrapper_unittest.cc', 'notifier/base/chrome_async_socket_unittest.cc', 'notifier/base/fake_ssl_client_socket_unittest.cc', 'notifier/base/xmpp_connection_unittest.cc', @@ -119,11 +134,13 @@ 'notifier/listener/push_notifications_subscribe_task_unittest.cc', 'notifier/listener/talk_mediator_unittest.cc', 'notifier/listener/xml_element_util_unittest.cc', + 'run_all_unittests.cc', ], 'include_dirs': [ '..', ], 'dependencies': [ + 'jingle_glue', 'notifier', 'notifier_test_util', '../base/base.gyp:base', @@ -134,18 +151,6 @@ '../testing/gtest.gyp:gtest', '../third_party/libjingle/libjingle.gyp:libjingle', ], - # TODO(akalin): Remove this once we have our own test suite and - # runner. - 'conditions': [ - ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { - 'dependencies': [ - # Needed to handle the #include chain: - # base/test/test_suite.h - # gtk/gtk.h - '../build/linux/system.gyp:gtk', - ], - }], - ], }, ], } |