| 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 # GN version: //remoting:test_support | 8 # GN version: //remoting:test_support |
| 9 'target_name': 'remoting_test_support', | 9 'target_name': 'remoting_test_support', |
| 10 'type': 'static_library', | 10 'type': 'static_library', |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 ] | 563 ] |
| 564 }], # end of 'enable_remoting_host' | 564 }], # end of 'enable_remoting_host' |
| 565 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 565 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 566 'targets': [ | 566 'targets': [ |
| 567 { | 567 { |
| 568 'target_name': 'remoting_webapp_browser_test', | 568 'target_name': 'remoting_webapp_browser_test', |
| 569 'type': 'none', | 569 'type': 'none', |
| 570 'variables': { | 570 'variables': { |
| 571 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.browsertest.v
2', | 571 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.browsertest.v
2', |
| 572 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.browsertest.v2.zip', | 572 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.browsertest.v2.zip', |
| 573 'webapp_type': 'v2_pnacl', | 573 'webapp_type': 'v2', |
| 574 'main_html_file': '<(SHARED_INTERMEDIATE_DIR)/browser_test/main.html
', | 574 'main_html_file': '<(SHARED_INTERMEDIATE_DIR)/browser_test/main.html
', |
| 575 'extra_files': [ | 575 'extra_files': [ |
| 576 'webapp/crd/remoting_client_pnacl.nmf.jinja2', | 576 'webapp/crd/remoting_client_pnacl.nmf.jinja2', |
| 577 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', | 577 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', |
| 578 '<@(remoting_webapp_browsertest_main_html_extra_files)', | 578 '<@(remoting_webapp_browsertest_main_html_extra_files)', |
| 579 ], | 579 ], |
| 580 }, | 580 }, |
| 581 'dependencies': [ | 581 'dependencies': [ |
| 582 'remoting_nacl.gyp:remoting_client_plugin_nacl', | 582 'remoting_nacl.gyp:remoting_client_plugin_nacl', |
| 583 'remoting_webapp_browser_test_main_html', | 583 'remoting_webapp_browser_test_main_html', |
| (...skipping 14 matching lines...) Expand all Loading... |
| 598 '../build/isolate.gypi', | 598 '../build/isolate.gypi', |
| 599 ], | 599 ], |
| 600 'sources': [ | 600 'sources': [ |
| 601 'remoting_unittests.isolate', | 601 'remoting_unittests.isolate', |
| 602 ], | 602 ], |
| 603 }, | 603 }, |
| 604 ], | 604 ], |
| 605 }], | 605 }], |
| 606 ] # end of 'conditions' | 606 ] # end of 'conditions' |
| 607 } | 607 } |
| OLD | NEW |