diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-28 00:12:27 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-28 00:12:27 +0000 |
| commit | c26bc27eb94c6c938758df12409ceba27a45e67d (patch) | |
| tree | e8726a4ee8558e683334e702e067868fbc9bcd8c /remoting/remoting.gyp | |
| parent | 8a5bef943be8ec1654bcbb952b5b67c818f8900e (diff) | |
| download | chromium_src-c26bc27eb94c6c938758df12409ceba27a45e67d.zip chromium_src-c26bc27eb94c6c938758df12409ceba27a45e67d.tar.gz chromium_src-c26bc27eb94c6c938758df12409ceba27a45e67d.tar.bz2 | |
Fork a copy of all the notifier code in chrome/common/net/notifier that we depend on.
This breaks a cycle int the build dependencies so that we can keep moving forward on
Chromoting implementation.
BUG=none
TEST=compiles on mac/linux/win
Review URL: http://codereview.chromium.org/2843026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 8fdf56c..f8a2f89 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -252,9 +252,7 @@ 'target_name': 'chromoting_jingle_glue', 'type': '<(library)', 'dependencies': [ - # TODO(sergeyu): move all code that is shared between notifier and - # jingle_glue to a separate library and use it here. - '../chrome/chrome.gyp:notifier', + '../net/net.gyp:net', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libjingle/libjingle.gyp:libjingle_p2p', ], @@ -263,18 +261,26 @@ '../third_party/libjingle/libjingle.gyp:libjingle_p2p', ], 'sources': [ - 'jingle_glue/iq_request.h', + 'jingle_glue/gaia_token_pre_xmpp_auth.cc', + 'jingle_glue/gaia_token_pre_xmpp_auth.h', 'jingle_glue/iq_request.cc', - 'jingle_glue/jingle_channel.h', + 'jingle_glue/iq_request.h', 'jingle_glue/jingle_channel.cc', - 'jingle_glue/jingle_client.h', + 'jingle_glue/jingle_channel.h', 'jingle_glue/jingle_client.cc', - 'jingle_glue/jingle_info_task.h', + 'jingle_glue/jingle_client.h', 'jingle_glue/jingle_info_task.cc', - 'jingle_glue/jingle_thread.h', + 'jingle_glue/jingle_info_task.h', 'jingle_glue/jingle_thread.cc', - 'jingle_glue/relay_port_allocator.h', + 'jingle_glue/jingle_thread.h', 'jingle_glue/relay_port_allocator.cc', + 'jingle_glue/relay_port_allocator.h', + 'jingle_glue/ssl_adapter.cc', + 'jingle_glue/ssl_adapter.h', + 'jingle_glue/ssl_socket_adapter.cc', + 'jingle_glue/ssl_socket_adapter.h', + 'jingle_glue/xmpp_socket_adapter.cc', + 'jingle_glue/xmpp_socket_adapter.h', ], }, # end of target 'chromoting_jingle_glue' @@ -305,13 +311,6 @@ '../gfx/gfx.gyp:*', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - # TODO(hclam): Remove all these extra dependencies notifier is moved - # outside of chrome.gyp. - '../chrome/chrome.gyp:browser', - '../chrome/chrome.gyp:chrome_version_info', - '../chrome/chrome.gyp:debugger', - '../chrome/chrome.gyp:plugin', - '../chrome/chrome.gyp:renderer', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:database', |