OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'targets': [ | 6 'targets': [ |
7 # Remoting unit tests | 7 # Remoting unit tests |
8 { | 8 { |
9 'target_name': 'remoting_unittests', | 9 'target_name': 'remoting_unittests', |
10 'type': '<(gtest_target_type)', | 10 'type': '<(gtest_target_type)', |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
338 }, | 338 }, |
339 { | 339 { |
340 'destination': '<(output_dir)', | 340 'destination': '<(output_dir)', |
341 'files': [ | 341 'files': [ |
342 '<@(remoting_webapp_unittest_cases)' | 342 '<@(remoting_webapp_unittest_cases)' |
343 ], | 343 ], |
344 }, | 344 }, |
345 ], | 345 ], |
346 'actions': [ | 346 'actions': [ |
347 { | 347 { |
348 'action_name': 'Build Remoting Webapp ut.html', | 348 'action_name': 'Build Remoting Webapp unittest.html', |
349 'inputs': [ | 349 'inputs': [ |
350 'webapp/build-html.py', | 350 'webapp/build-html.py', |
351 '<(remoting_webapp_unittest_template_main)', | 351 '<(remoting_webapp_unittest_template_main)', |
352 '<@(remoting_webapp_main_html_js_files)', | 352 '<@(remoting_webapp_main_html_js_files)', |
353 '<@(remoting_webapp_unittest_exclude_files)', | |
garykac
2014/07/10 20:38:12
I assume that removing this is unrelated to the ch
kelvinp
2014/07/10 20:56:47
Yup, maybe should rename the change as fix build d
| |
354 '<@(remoting_webapp_unittest_cases)' | 353 '<@(remoting_webapp_unittest_cases)' |
355 ], | 354 ], |
356 'outputs': [ | 355 'outputs': [ |
357 '<(PRODUCT_DIR)/unittest.html', | 356 '<(output_dir)/unittest.html', |
358 ], | 357 ], |
359 'action': [ | 358 'action': [ |
360 'python', 'webapp/build-html.py', | 359 'python', 'webapp/build-html.py', |
361 '<(output_dir)/unittest.html', | 360 '<@(_outputs)', |
362 '<(remoting_webapp_unittest_template_main)', | 361 '<(remoting_webapp_unittest_template_main)', |
363 # GYP automatically removes subsequent duplicated command line | 362 # GYP automatically removes subsequent duplicated command line |
364 # arguments. Therefore, the excludejs flag must be set before the | 363 # arguments. Therefore, the excludejs flag must be set before the |
365 # instrumentedjs flag or else GYP will ignore the files in the | 364 # instrumentedjs flag or else GYP will ignore the files in the |
366 # exclude list. | 365 # exclude list. |
367 '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', | 366 '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', |
368 '--js', '<@(remoting_webapp_unittest_cases)', | 367 '--js', '<@(remoting_webapp_unittest_cases)', |
369 '--instrument-js', '<@(remoting_webapp_main_html_js_files)', | 368 '--instrument-js', '<@(remoting_webapp_main_html_js_files)', |
370 ], | 369 ], |
371 }, | 370 }, |
372 ], | 371 ], |
373 }, # end of target 'remoting_webapp_js_unittest' | 372 }, # end of target 'remoting_webapp_js_unittest' |
374 ], # end of targets | 373 ], # end of targets |
375 } | 374 } |
OLD | NEW |