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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/jingle.gyp

Issue 10829424: Create stub jingle library for iOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Follow review Created 8 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
« no previous file with comments | « no previous file | jingle/notifier/base/gaia_constants.h » ('j') | 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 015c84f544181aede007f587880f14946eec039d..b1270b65cd015aad79fe229e748e377794343e75 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -6,205 +6,239 @@
'variables': {
'chromium_code': 1,
}, # variables
- 'targets': [
- # A library of various utils for integration with libjingle.
- {
- 'target_name': 'jingle_glue',
- 'type': 'static_library',
- '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/task_pump.cc',
- 'glue/task_pump.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',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../net/net.gyp:net',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
- ],
- 'export_dependent_settings': [
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
- ],
- },
- # A library for sending and receiving peer-issued notifications.
- #
- # TODO(akalin): Separate out the XMPP stuff from this library into
- # its own library.
- {
- 'target_name': 'notifier',
- 'type': 'static_library',
- 'sources': [
- 'notifier/base/const_communicator.h',
- 'notifier/base/gaia_token_pre_xmpp_auth.cc',
- 'notifier/base/gaia_token_pre_xmpp_auth.h',
- 'notifier/base/notification_method.h',
- 'notifier/base/notification_method.cc',
- 'notifier/base/notifier_options.cc',
- 'notifier/base/notifier_options.h',
- 'notifier/base/notifier_options_util.cc',
- 'notifier/base/notifier_options_util.h',
- 'notifier/base/server_information.cc',
- 'notifier/base/server_information.h',
- 'notifier/base/weak_xmpp_client.cc',
- 'notifier/base/weak_xmpp_client.h',
- 'notifier/base/xmpp_connection.cc',
- 'notifier/base/xmpp_connection.h',
- 'notifier/communicator/connection_settings.cc',
- 'notifier/communicator/connection_settings.h',
- 'notifier/communicator/login.cc',
- 'notifier/communicator/login.h',
- 'notifier/communicator/login_settings.cc',
- 'notifier/communicator/login_settings.h',
- 'notifier/communicator/single_login_attempt.cc',
- 'notifier/communicator/single_login_attempt.h',
- 'notifier/listener/non_blocking_push_client.cc',
- 'notifier/listener/non_blocking_push_client.h',
- 'notifier/listener/notification_constants.cc',
- 'notifier/listener/notification_constants.h',
- 'notifier/listener/notification_defines.cc',
- 'notifier/listener/notification_defines.h',
- 'notifier/listener/push_client_observer.cc',
- 'notifier/listener/push_client_observer.h',
- 'notifier/listener/push_client.cc',
- 'notifier/listener/push_client.h',
- 'notifier/listener/push_notifications_listen_task.cc',
- 'notifier/listener/push_notifications_listen_task.h',
- 'notifier/listener/push_notifications_send_update_task.cc',
- 'notifier/listener/push_notifications_send_update_task.h',
- 'notifier/listener/push_notifications_subscribe_task.cc',
- 'notifier/listener/push_notifications_subscribe_task.h',
- 'notifier/listener/xml_element_util.cc',
- 'notifier/listener/xml_element_util.h',
- 'notifier/listener/xmpp_push_client.cc',
- 'notifier/listener/xmpp_push_client.h',
- ],
- 'defines' : [
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../net/net.gyp:net',
- '../third_party/expat/expat.gyp:expat',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- ],
- 'export_dependent_settings': [
- '../third_party/libjingle/libjingle.gyp:libjingle',
- ],
- 'conditions': [
- ['toolkit_uses_gtk == 1', {
+ 'conditions': [
+ ['OS != "ios"', {
+ 'targets': [
+ # A library of various utils for integration with libjingle.
+ {
+ 'target_name': 'jingle_glue',
+ 'type': 'static_library',
+ '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/task_pump.cc',
+ 'glue/task_pump.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': [
- '../build/linux/system.gyp:gtk'
+ '../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../net/net.gyp:net',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
],
- }],
- ],
- },
- {
- 'target_name': 'notifier_test_util',
- 'type': 'static_library',
- 'sources': [
- 'notifier/base/fake_base_task.cc',
- 'notifier/base/fake_base_task.h',
- 'notifier/listener/fake_push_client.cc',
- 'notifier/listener/fake_push_client.h',
- 'notifier/listener/fake_push_client_observer.cc',
- 'notifier/listener/fake_push_client_observer.h',
- ],
- 'dependencies': [
- 'notifier',
- '../base/base.gyp:base',
- '../testing/gmock.gyp:gmock',
- ],
- },
- {
- 'target_name': 'jingle_glue_test_util',
- 'type': 'static_library',
- 'sources': [
- 'glue/fake_network_manager.cc',
- 'glue/fake_network_manager.h',
- 'glue/fake_socket_factory.cc',
- 'glue/fake_socket_factory.h',
- ],
- 'dependencies': [
- 'jingle_glue',
- '../base/base.gyp:base',
- ],
- },
- {
- 'target_name': 'jingle_unittests',
- '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/mock_task.cc',
- 'glue/mock_task.h',
- 'glue/proxy_resolving_client_socket_unittest.cc',
- 'glue/pseudotcp_adapter_unittest.cc',
- 'glue/task_pump_unittest.cc',
- 'glue/thread_wrapper_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',
- 'notifier/listener/non_blocking_push_client_unittest.cc',
- 'notifier/listener/notification_defines_unittest.cc',
- 'notifier/listener/push_client_unittest.cc',
- 'notifier/listener/push_notifications_send_update_task_unittest.cc',
- 'notifier/listener/push_notifications_subscribe_task_unittest.cc',
- 'notifier/listener/xml_element_util_unittest.cc',
- 'notifier/listener/xmpp_push_client_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?
+ 'export_dependent_settings': [
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
+ ],
+ },
+ # A library for sending and receiving peer-issued notifications.
+ #
+ # TODO(akalin): Separate out the XMPP stuff from this library into
+ # its own library.
+ {
+ 'target_name': 'notifier',
+ 'type': 'static_library',
+ 'sources': [
+ 'notifier/base/const_communicator.h',
+ 'notifier/base/gaia_constants.cc',
+ 'notifier/base/gaia_constants.h',
+ 'notifier/base/gaia_token_pre_xmpp_auth.cc',
+ 'notifier/base/gaia_token_pre_xmpp_auth.h',
+ 'notifier/base/notification_method.h',
+ 'notifier/base/notification_method.cc',
+ 'notifier/base/notifier_options.cc',
+ 'notifier/base/notifier_options.h',
+ 'notifier/base/notifier_options_util.cc',
+ 'notifier/base/notifier_options_util.h',
+ 'notifier/base/server_information.cc',
+ 'notifier/base/server_information.h',
+ 'notifier/base/weak_xmpp_client.cc',
+ 'notifier/base/weak_xmpp_client.h',
+ 'notifier/base/xmpp_connection.cc',
+ 'notifier/base/xmpp_connection.h',
+ 'notifier/communicator/connection_settings.cc',
+ 'notifier/communicator/connection_settings.h',
+ 'notifier/communicator/login.cc',
+ 'notifier/communicator/login.h',
+ 'notifier/communicator/login_settings.cc',
+ 'notifier/communicator/login_settings.h',
+ 'notifier/communicator/single_login_attempt.cc',
+ 'notifier/communicator/single_login_attempt.h',
+ 'notifier/listener/non_blocking_push_client.cc',
+ 'notifier/listener/non_blocking_push_client.h',
+ 'notifier/listener/notification_constants.cc',
+ 'notifier/listener/notification_constants.h',
+ 'notifier/listener/notification_defines.cc',
+ 'notifier/listener/notification_defines.h',
+ 'notifier/listener/push_client_observer.cc',
+ 'notifier/listener/push_client_observer.h',
+ 'notifier/listener/push_client.cc',
+ 'notifier/listener/push_client.h',
+ 'notifier/listener/push_notifications_listen_task.cc',
+ 'notifier/listener/push_notifications_listen_task.h',
+ 'notifier/listener/push_notifications_send_update_task.cc',
+ 'notifier/listener/push_notifications_send_update_task.h',
+ 'notifier/listener/push_notifications_subscribe_task.cc',
+ 'notifier/listener/push_notifications_subscribe_task.h',
+ 'notifier/listener/xml_element_util.cc',
+ 'notifier/listener/xml_element_util.h',
+ 'notifier/listener/xmpp_push_client.cc',
+ 'notifier/listener/xmpp_push_client.h',
+ ],
+ 'defines' : [
+ '_CRT_SECURE_NO_WARNINGS',
+ '_USE_32BIT_TIME_T',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../net/net.gyp:net',
+ '../third_party/expat/expat.gyp:expat',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ ],
+ 'export_dependent_settings': [
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ ],
+ 'conditions': [
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk'
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'notifier_test_util',
+ 'type': 'static_library',
+ 'sources': [
+ 'notifier/base/fake_base_task.cc',
+ 'notifier/base/fake_base_task.h',
+ 'notifier/listener/fake_push_client.cc',
+ 'notifier/listener/fake_push_client.h',
+ 'notifier/listener/fake_push_client_observer.cc',
+ 'notifier/listener/fake_push_client_observer.h',
+ ],
+ 'dependencies': [
+ 'notifier',
+ '../base/base.gyp:base',
+ '../testing/gmock.gyp:gmock',
+ ],
+ },
+ {
+ 'target_name': 'jingle_glue_test_util',
+ 'type': 'static_library',
+ 'sources': [
+ 'glue/fake_network_manager.cc',
+ 'glue/fake_network_manager.h',
+ 'glue/fake_socket_factory.cc',
+ 'glue/fake_socket_factory.h',
+ ],
+ 'dependencies': [
+ 'jingle_glue',
+ '../base/base.gyp:base',
+ ],
+ },
+ {
+ 'target_name': 'jingle_unittests',
+ '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/mock_task.cc',
+ 'glue/mock_task.h',
+ 'glue/proxy_resolving_client_socket_unittest.cc',
+ 'glue/pseudotcp_adapter_unittest.cc',
+ 'glue/task_pump_unittest.cc',
+ 'glue/thread_wrapper_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',
+ 'notifier/listener/non_blocking_push_client_unittest.cc',
+ 'notifier/listener/notification_defines_unittest.cc',
+ 'notifier/listener/push_client_unittest.cc',
+ 'notifier/listener/push_notifications_send_update_task_unittest.cc',
+ 'notifier/listener/push_notifications_subscribe_task_unittest.cc',
+ 'notifier/listener/xml_element_util_unittest.cc',
+ 'notifier/listener/xmpp_push_client_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?
+ 'glue/chrome_async_socket_unittest.cc',
+ 'notifier/base/xmpp_connection_unittest.cc',
+ ],
+ }]],
+ 'include_dirs': [
+ '..',
+ ],
+ 'dependencies': [
+ 'jingle_glue',
+ 'jingle_glue_test_util',
+ 'notifier',
+ 'notifier_test_util',
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../net/net.gyp:net',
+ '../net/net.gyp:net_test_support',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
],
- }]],
- 'include_dirs': [
- '..',
+ },
],
- 'dependencies': [
- 'jingle_glue',
- 'jingle_glue_test_util',
- 'notifier',
- 'notifier_test_util',
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../net/net.gyp:net',
- '../net/net.gyp:net_test_support',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '../third_party/libjingle/libjingle.gyp:libjingle',
+ }, { # OS == "ios"
+ 'targets': [
+ # Stub targets as iOS doesn't use libjingle.
+ {
+ 'target_name': 'jingle_glue',
+ 'type': 'none',
+ },
+ {
+ 'target_name': 'notifier',
+ 'type': 'static_library',
+ 'sources': [
+ 'notifier/base/gaia_constants.cc',
+ 'notifier/base/gaia_constants.h',
+ 'notifier/base/notification_method.h',
+ 'notifier/base/notification_method.cc',
+ 'notifier/base/notifier_options.cc',
+ 'notifier/base/notifier_options.h',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../net/net.gyp:net',
+ ],
+ },
+ {
+ 'target_name': 'notifier_test_util',
+ 'type': 'none',
+ },
],
- },
+ }],
],
}
« no previous file with comments | « no previous file | jingle/notifier/base/gaia_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698