| Index: remoting/remoting_test.gypi
|
| diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
|
| index 7d584ae95e4a78c7054c480518a2c5098ffcde45..2ed07027228e6e2abecfe33aa67b256de19a9d23 100644
|
| --- a/remoting/remoting_test.gypi
|
| +++ b/remoting/remoting_test.gypi
|
| @@ -288,8 +288,7 @@
|
| {
|
| 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources',
|
| 'files': [
|
| - '<@(remoting_webapp_js_test_common_files)',
|
| - '<@(remoting_webapp_js_browser_test_files)',
|
| + '<@(remoting_webapp_browsertest_js_all_files)',
|
| ],
|
| },
|
| ], # end of copies
|
| @@ -332,9 +331,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)',
|
| ],
|
| },
|
| ],
|
| @@ -345,8 +342,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_js_all_files)'
|
| ],
|
| 'outputs': [
|
| '<(output_dir)/unittest.html',
|
| @@ -359,9 +355,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_js_exclude_files)',
|
| + '--js', '<@(remoting_webapp_unittest_js_all_files)',
|
| '--instrument-js', '<@(webapp_js_files)',
|
| ],
|
| },
|
|
|