diff options
| author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 22:55:24 +0000 |
|---|---|---|
| committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 22:55:24 +0000 |
| commit | 1243f0537d891f9ee5d803ffac94045c9b591f49 (patch) | |
| tree | 2e08884a7070514f103b0d57cf9a299c3d55f686 /remoting | |
| parent | 7488bf7fcf18c54ba42959ddef599868c11a21ef (diff) | |
| download | chromium_src-1243f0537d891f9ee5d803ffac94045c9b591f49.zip chromium_src-1243f0537d891f9ee5d803ffac94045c9b591f49.tar.gz chromium_src-1243f0537d891f9ee5d803ffac94045c9b591f49.tar.bz2 | |
Don't build remoting host on ChromeOS.
The host doesn't currently compile on the ChromeOS builders because it uses GTK.
BUG=None
TEST=ChromeOS build bot is green.
Review URL: https://chromiumcodereview.appspot.com/9390029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 2fa1236..e14a3c4 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -906,7 +906,6 @@ 'dependencies': [ 'remoting_base', 'remoting_client', - 'remoting_host', 'remoting_jingle_glue', 'remoting_protocol', '../base/base.gyp:base', @@ -939,22 +938,6 @@ 'host/capturer_linux_unittest.cc', 'host/capturer_mac_unittest.cc', 'host/capturer_win_unittest.cc', - 'host/chromoting_host_context_unittest.cc', - 'host/chromoting_host_unittest.cc', - 'host/client_session_unittest.cc', - 'host/differ_block_unittest.cc', - 'host/differ_unittest.cc', - 'host/heartbeat_sender_unittest.cc', - 'host/host_key_pair_unittest.cc', - 'host/host_mock_objects.cc', - 'host/host_mock_objects.h', - 'host/it2me_host_user_interface.cc', - 'host/it2me_host_user_interface.h', - 'host/json_host_config_unittest.cc', - 'host/log_to_server_unittest.cc', - 'host/register_support_host_request_unittest.cc', - 'host/screen_recorder_unittest.cc', - 'host/server_log_entry_unittest.cc', 'host/test_key_pair.h', 'jingle_glue/fake_signal_strategy.cc', 'jingle_glue/fake_signal_strategy.h', @@ -989,6 +972,29 @@ 'run_all_unittests.cc', ], 'conditions': [ + ['chromeos == 0', { + 'dependencies': [ + 'remoting_host' + ], + 'sources': [ + 'host/chromoting_host_context_unittest.cc', + 'host/chromoting_host_unittest.cc', + 'host/client_session_unittest.cc', + 'host/differ_block_unittest.cc', + 'host/differ_unittest.cc', + 'host/heartbeat_sender_unittest.cc', + 'host/host_key_pair_unittest.cc', + 'host/host_mock_objects.cc', + 'host/host_mock_objects.h', + 'host/it2me_host_user_interface.cc', + 'host/it2me_host_user_interface.h', + 'host/json_host_config_unittest.cc', + 'host/log_to_server_unittest.cc', + 'host/register_support_host_request_unittest.cc', + 'host/screen_recorder_unittest.cc', + 'host/server_log_entry_unittest.cc', + ] + }], ['toolkit_uses_gtk == 1', { 'dependencies': [ # Needed for the following #include chain: |