| 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 { | 7 { |
| 8 'target_name': 'remoting_test_common', | 8 'target_name': 'remoting_test_common', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'dependencies': [ | 10 'dependencies': [ |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 'target_name': 'remoting_browser_test_resources', | 292 'target_name': 'remoting_browser_test_resources', |
| 293 'type': 'none', | 293 'type': 'none', |
| 294 'copies': [ | 294 'copies': [ |
| 295 { | 295 { |
| 296 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources', | 296 'destination': '<(PRODUCT_DIR)/remoting/browser_test_resources', |
| 297 'files': [ | 297 'files': [ |
| 298 '<@(remoting_webapp_js_test_common_files)', | 298 '<@(remoting_webapp_js_test_common_files)', |
| 299 '<@(remoting_webapp_js_browser_test_files)', | 299 '<@(remoting_webapp_js_browser_test_files)', |
| 300 ], | 300 ], |
| 301 }, | 301 }, |
| 302 ], #end of copies | 302 ], # end of copies |
| 303 }, # end of target 'remoting_browser_test_resources' | 303 }, # end of target 'remoting_browser_test_resources' |
| 304 { | 304 { |
| 305 'target_name': 'remoting_webapp_unittest', | 305 'target_name': 'remoting_webapp_unittest', |
| 306 'type': 'none', | 306 'type': 'none', |
| 307 'variables': { | 307 'variables': { |
| 308 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', | 308 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', |
| 309 'webapp_js_files': [ | 309 'webapp_js_files': [ |
| 310 '<@(remoting_webapp_shared_main_html_js_files)', | 310 '<@(remoting_webapp_shared_main_html_js_files)', |
| 311 '<@(remoting_webapp_js_wcs_sandbox_files)', | 311 '<@(remoting_webapp_js_wcs_sandbox_files)', |
| 312 '<@(remoting_webapp_background_js_files)', | 312 '<@(remoting_webapp_background_js_files)', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 # arguments. Therefore, the excludejs flag must be set before the | 366 # arguments. Therefore, the excludejs flag must be set before the |
| 367 # instrumentedjs flag or else GYP will ignore the files in the | 367 # instrumentedjs flag or else GYP will ignore the files in the |
| 368 # exclude list. | 368 # exclude list. |
| 369 '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', | 369 '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', |
| 370 '--js', '<@(remoting_webapp_unittest_js_files)', | 370 '--js', '<@(remoting_webapp_unittest_js_files)', |
| 371 '<@(remoting_webapp_js_test_common_files)', | 371 '<@(remoting_webapp_js_test_common_files)', |
| 372 '--instrument-js', '<@(webapp_js_files)', | 372 '--instrument-js', '<@(webapp_js_files)', |
| 373 ], | 373 ], |
| 374 }, | 374 }, |
| 375 ], | 375 ], |
| 376 }, # end of target 'remoting_webapp_js_unittest' | 376 }, # end of target 'remoting_webapp_unittest' |
| 377 ], # end of targets | 377 ], # end of targets |
| 378 | 378 |
| 379 'conditions': [ | 379 'conditions': [ |
| 380 ['enable_remoting_host==1', { | 380 ['enable_remoting_host==1', { |
| 381 'targets': [ | 381 'targets': [ |
| 382 # Remoting performance tests | 382 # Remoting performance tests |
| 383 { | 383 { |
| 384 'target_name': 'remoting_perftests', | 384 'target_name': 'remoting_perftests', |
| 385 'type': '<(gtest_target_type)', | 385 'type': '<(gtest_target_type)', |
| 386 'dependencies': [ | 386 'dependencies': [ |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 'dependencies': [ | 422 'dependencies': [ |
| 423 '../base/allocator/allocator.gyp:allocator', | 423 '../base/allocator/allocator.gyp:allocator', |
| 424 ], | 424 ], |
| 425 }], | 425 }], |
| 426 ], # end of 'conditions' | 426 ], # end of 'conditions' |
| 427 }, # end of target 'remoting_perftests' | 427 }, # end of target 'remoting_perftests' |
| 428 ] | 428 ] |
| 429 }] | 429 }] |
| 430 ] | 430 ] |
| 431 } | 431 } |
| OLD | NEW |