diff options
| author | kelvinp@chromium.org <kelvinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 12:42:28 +0000 |
|---|---|---|
| committer | kelvinp@chromium.org <kelvinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 12:44:38 +0000 |
| commit | 23005b6b310879f5877e2411cc7aec74480861dc (patch) | |
| tree | 949ad16391059d26d271675489fd08f7b89a8178 /remoting/remoting_test.gypi | |
| parent | b8e70ea6025cdb426a5514ee58179cf417ade1be (diff) | |
| download | chromium_src-23005b6b310879f5877e2411cc7aec74480861dc.zip chromium_src-23005b6b310879f5877e2411cc7aec74480861dc.tar.gz chromium_src-23005b6b310879f5877e2411cc7aec74480861dc.tar.bz2 | |
Hangouts remote desktop part III - It2MeService
This CL
- Introduces an It2MeService component that listens to incoming connection requests between Hangouts and the webapp and establish a channel between them.
- It enables launching an IT2Me helper session from Hangouts
Review URL: https://codereview.chromium.org/468693002
Cr-Commit-Position: refs/heads/master@{#289538}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting_test.gypi')
| -rw-r--r-- | remoting/remoting_test.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 03292a4..6227b3a 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -327,7 +327,7 @@ 'destination': '<(output_dir)', 'files': [ '<@(webapp_js_files)', - '<@(remoting_webapp_unittest_cases)', + '<@(remoting_webapp_unittest_js_files)', '<@(remoting_webapp_unittest_additional_files)' ], }, @@ -339,7 +339,7 @@ 'webapp/build-html.py', '<(remoting_webapp_unittest_template_main)', '<@(webapp_js_files)', - '<@(remoting_webapp_unittest_cases)' + '<@(remoting_webapp_unittest_js_files)' ], 'outputs': [ '<(output_dir)/unittest.html', @@ -353,7 +353,7 @@ # instrumentedjs flag or else GYP will ignore the files in the # exclude list. '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', - '--js', '<@(remoting_webapp_unittest_cases)', + '--js', '<@(remoting_webapp_unittest_js_files)', '--instrument-js', '<@(webapp_js_files)', ], }, |