Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/jingle.gyp

Issue 9131032: android build: jingle_unittests work (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/jingle.gyp
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index 077845317d2c88f7e59737e787558b81c97939c9..b940bd6e96a129c7e2ce47185d20b197afe7f928 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': [
'..',
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698