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

Unified Diff: base/base.gyp

Issue 11412101: Provide an iOS message pump for IO implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Restore StopWatchingFileDescriptor signature Created 8 years, 1 month 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 | base/mac/scoped_cffiledescriptorref.h » ('j') | base/message_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 4102004d0dd4a2740d6034e1f04047fa95dc8bba..dce0dc79e2bec2ef5c6217576de57fb828585e77 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -194,7 +194,7 @@
],
},
}],
- ['OS != "win"', {
+ ['OS != "win" and OS != "ios"', {
'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
},],
['component=="shared_library"', {
@@ -227,6 +227,8 @@
'message_pump_glib.h',
'message_pump_gtk.cc',
'message_pump_gtk.h',
+ 'message_pump_io_ios.h',
+ 'message_pump_io_ios.mm',
'message_pump_observer.h',
'message_pump_aurax11.cc',
'message_pump_aurax11.h',
@@ -481,6 +483,7 @@
'message_loop_proxy_unittest.cc',
'message_loop_unittest.cc',
'message_pump_glib_unittest.cc',
+ 'message_pump_io_ios_unittest.cc',
'message_pump_libevent_unittest.cc',
'metrics/sample_map_unittest.cc',
'metrics/sample_vector_unittest.cc',
@@ -613,9 +616,11 @@
['include', '^process_util_unittest_ios\\.cc$'],
# Requires spawning processes.
['exclude', '^metrics/stats_table_unittest\\.cc$'],
+ # iOS does not use message_pump_libevent.
+ ['exclude', '^message_pump_libevent_unittest\\.cc$'],
# TODO(ios): Remove these as base/ is unforked.
- # For now, exclude everything that doesn't build as-is, just to
- # get a minimal target building.
+ # For now, exclude everything that doesn't build as-is, just to get
+ # a minimal target building.
# Unittests that don't pass.
['exclude', '^message_loop_unittest\\.cc$'],
],
« no previous file with comments | « no previous file | base/mac/scoped_cffiledescriptorref.h » ('j') | base/message_loop.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698