diff options
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index d63aee7..8473820 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -125,9 +125,9 @@ '../chrome/browser/chromeos/text_input/text_input.gyp:*', ], }], - ['chromoting==1', { + ['remoting==1', { 'dependencies': [ - '../remoting/chromoting.gyp:*', + '../remoting/remoting.gyp:*', ], }], ], @@ -158,6 +158,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:nacl_ui_tests', '../chrome/chrome.gyp:notifier_unit_tests', @@ -190,6 +191,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', ], @@ -205,6 +207,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', ], }, @@ -245,6 +248,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin', # TODO(nsylvain) ui_tests.exe depends on test_shell_common. @@ -280,6 +284,7 @@ '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', @@ -320,6 +325,7 @@ '../media/media.gyp:omx_test', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', '../chrome/browser/chromeos/text_input/text_input.gyp:candidate_window', |