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

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: Add comments, rebase Created 6 years, 3 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 | « build/all.gyp ('k') | mojo/mojo_public_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 3b8a78a55fcd0f41cb1ca102f6e21626f4d26e9e..123ce86e662638b0f85a8aeca39d2ed156f82973 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -16,6 +16,11 @@
'target_name': 'mojo_base',
'type': 'none',
'dependencies': [
+ # NOTE: If adding a new dependency here, please consider whether it
+ # should also be added to the list of Mojo-related dependencies of
+ # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
+ # target on iOS due to the presence of the js targets, which cause v8
+ # to be built.
'mojo_common_lib',
'mojo_common_unittests',
'mojo_cpp_bindings',
@@ -228,6 +233,14 @@
'system/waiter_test_utils.h',
'system/waiter_unittest.cc',
],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'sources!': [
+ 'embedder/embedder_unittest.cc',
+ 'system/multiprocess_message_pipe_unittest.cc',
+ ],
+ }],
+ ],
},
{
# GN version: //mojo/system:mojo_message_pipe_perftests
@@ -309,6 +322,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
@@ -332,6 +352,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
« no previous file with comments | « build/all.gyp ('k') | mojo/mojo_public_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698