| Index: remoting/remoting_test.gypi
|
| diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
|
| index a6510d9ff41bb4d4741fcf6c0e95554d60a812be..ad1d371336eb94cec10f03715695e76ea987c121 100644
|
| --- a/remoting/remoting_test.gypi
|
| +++ b/remoting/remoting_test.gypi
|
| @@ -290,8 +290,7 @@
|
| {
|
| 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources',
|
| 'files': [
|
| - '<@(remoting_webapp_js_test_common_files)',
|
| - '<@(remoting_webapp_js_browser_test_files)',
|
| + '<@(remoting_webapp_browsertest_all_js_files)',
|
| ],
|
| },
|
| ], # end of copies
|
| @@ -334,9 +333,7 @@
|
| 'destination': '<(output_dir)',
|
| 'files': [
|
| '<@(webapp_js_files)',
|
| - '<@(remoting_webapp_js_test_common_files)',
|
| - '<@(remoting_webapp_unittest_additional_files)',
|
| - '<@(remoting_webapp_unittest_js_files)',
|
| + '<@(remoting_webapp_unittest_all_files)',
|
| ],
|
| },
|
| ],
|
| @@ -347,8 +344,7 @@
|
| 'webapp/build-html.py',
|
| '<(remoting_webapp_unittest_template_main)',
|
| '<@(webapp_js_files)',
|
| - '<@(remoting_webapp_js_test_common_files)',
|
| - '<@(remoting_webapp_unittest_js_files)'
|
| + '<@(remoting_webapp_unittest_all_js_files)'
|
| ],
|
| 'outputs': [
|
| '<(output_dir)/unittest.html',
|
| @@ -361,9 +357,8 @@
|
| # arguments. Therefore, the excludejs flag must be set before the
|
| # instrumentedjs flag or else GYP will ignore the files in the
|
| # exclude list.
|
| - '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)',
|
| - '--js', '<@(remoting_webapp_unittest_js_files)',
|
| - '<@(remoting_webapp_js_test_common_files)',
|
| + '--exclude-js', '<@(remoting_webapp_unittest_exclude_js_files)',
|
| + '--js', '<@(remoting_webapp_unittest_all_js_files)',
|
| '--instrument-js', '<@(webapp_js_files)',
|
| ],
|
| },
|
|
|