Index: jingle/jingle.gyp |
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp |
index 3d424a0369d936487f735b09f25149e5bfceb2a8..c2454322e403adb687fd37c86b68f60e571422d9 100644 |
--- a/jingle/jingle.gyp |
+++ b/jingle/jingle.gyp |
@@ -14,12 +14,21 @@ |
'sources': [ |
'glue/channel_socket_adapter.cc', |
'glue/channel_socket_adapter.h', |
+ 'glue/chrome_async_socket.cc', |
+ 'glue/chrome_async_socket.h', |
+ 'glue/fake_ssl_client_socket.cc', |
+ 'glue/fake_ssl_client_socket.h', |
+ 'glue/proxy_resolving_client_socket.cc', |
+ 'glue/proxy_resolving_client_socket.h', |
'glue/pseudotcp_adapter.cc', |
'glue/pseudotcp_adapter.h', |
+ 'glue/resolving_client_socket_factory.h', |
'glue/thread_wrapper.cc', |
'glue/thread_wrapper.h', |
'glue/utils.cc', |
'glue/utils.h', |
+ 'glue/xmpp_client_socket_factory.cc', |
+ 'glue/xmpp_client_socket_factory.h', |
], |
'dependencies': [ |
'../base/base.gyp:base', |
@@ -41,11 +50,7 @@ |
'target_name': 'notifier', |
'type': 'static_library', |
'sources': [ |
- 'notifier/base/chrome_async_socket.cc', |
- 'notifier/base/chrome_async_socket.h', |
'notifier/base/const_communicator.h', |
- 'notifier/base/fake_ssl_client_socket.cc', |
- 'notifier/base/fake_ssl_client_socket.h', |
'notifier/base/gaia_token_pre_xmpp_auth.cc', |
'notifier/base/gaia_token_pre_xmpp_auth.h', |
'notifier/base/notification_method.h', |
@@ -54,17 +59,12 @@ |
'notifier/base/notifier_options.h', |
'notifier/base/notifier_options_util.cc', |
'notifier/base/notifier_options_util.h', |
- 'notifier/base/proxy_resolving_client_socket.cc', |
- 'notifier/base/proxy_resolving_client_socket.h', |
- 'notifier/base/resolving_client_socket_factory.h', |
'notifier/base/server_information.cc', |
'notifier/base/server_information.h', |
'notifier/base/task_pump.cc', |
'notifier/base/task_pump.h', |
'notifier/base/weak_xmpp_client.cc', |
'notifier/base/weak_xmpp_client.h', |
- 'notifier/base/xmpp_client_socket_factory.cc', |
- 'notifier/base/xmpp_client_socket_factory.h', |
'notifier/base/xmpp_connection.cc', |
'notifier/base/xmpp_connection.h', |
'notifier/communicator/connection_settings.cc', |
@@ -156,17 +156,17 @@ |
'type': 'executable', |
'sources': [ |
'glue/channel_socket_adapter_unittest.cc', |
+ 'glue/chrome_async_socket_unittest.cc', |
+ 'glue/fake_ssl_client_socket_unittest.cc', |
'glue/jingle_glue_mock_objects.cc', |
'glue/jingle_glue_mock_objects.h', |
'glue/logging_unittest.cc', |
+ 'glue/proxy_resolving_client_socket_unittest.cc', |
'glue/pseudotcp_adapter_unittest.cc', |
'glue/thread_wrapper_unittest.cc', |
- 'notifier/base/chrome_async_socket_unittest.cc', |
- 'notifier/base/fake_ssl_client_socket_unittest.cc', |
- 'notifier/base/proxy_resolving_client_socket_unittest.cc', |
'notifier/base/task_pump_unittest.cc', |
- 'notifier/base/xmpp_connection_unittest.cc', |
'notifier/base/weak_xmpp_client_unittest.cc', |
+ 'notifier/base/xmpp_connection_unittest.cc', |
'notifier/communicator/connection_settings_unittest.cc', |
'notifier/communicator/login_settings_unittest.cc', |
'notifier/communicator/single_login_attempt_unittest.cc', |
@@ -184,7 +184,7 @@ |
# 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', |
+ 'glue/chrome_async_socket_unittest.cc', |
'notifier/base/xmpp_connection_unittest.cc', |
], |
}]], |