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

Unified Diff: mojo/mojo_base.gyp

Issue 528763002: Build targets from mojo_base on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 3f0525b049a1af441f0237feaf95546a60a2e864..fab11441b368b9310ecfec80119b8fd832975cb5 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -226,6 +226,14 @@
'system/waiter_test_utils.h',
'system/waiter_unittest.cc',
],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'embedder/embedder_unittest.cc',
qsr 2014/09/04 13:35:45 You might want to cut this test in 2, one for in p
blundell 2014/09/04 15:02:51 I'll look at this but would prefer to save it for
+ 'system/multiprocess_message_pipe_unittest.cc',
+ ],
+ }],
+ ],
},
{
# GN version: //mojo/system:mojo_message_pipe_perftests
@@ -307,6 +315,13 @@
'common/test/test_utils_posix.cc',
'common/test/test_utils_win.cc',
],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'common/test/multiprocess_test_helper.cc',
+ ],
+ }],
+ ],
},
{
# GN version: //mojo/common:mojo_common_unittests
@@ -330,6 +345,13 @@
'common/message_pump_mojo_unittest.cc',
'common/test/multiprocess_test_helper_unittest.cc',
],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'common/test/multiprocess_test_helper_unittest.cc',
+ ],
+ }],
+ ],
},
{
# GN version: //mojo/environment:chromium

Powered by Google App Engine
This is Rietveld 408576698