diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 21:31:49 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 21:31:49 +0000 |
| commit | 390037238b537ec9a5335430df31e01ceb65c4ca (patch) | |
| tree | 240eb9cda75103e8cbe5eef83e2959304a71b784 /jingle | |
| parent | 27d7eddf9054383070cbf7d051b46d51d38ff46b (diff) | |
| download | chromium_src-390037238b537ec9a5335430df31e01ceb65c4ca.zip chromium_src-390037238b537ec9a5335430df31e01ceb65c4ca.tar.gz chromium_src-390037238b537ec9a5335430df31e01ceb65c4ca.tar.bz2 | |
android build: jingle_unittests work
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9131032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/jingle.gyp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 0778453..b940bd6 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -175,6 +175,16 @@ 'notifier/listener/xml_element_util_unittest.cc', 'run_all_unittests.cc', ], + 'conditions': [ + ['OS=="android"', { + 'sources!': [ + # TODO(jrg): + # EXPECT_DEBUG_DEATH() uses features not enabled. + # Should we -std=c++0x or -std=gnu++0x? + 'notifier/base/chrome_async_socket_unittest.cc', + 'notifier/base/xmpp_connection_unittest.cc', + ], + }]], 'include_dirs': [ '..', ], |