| 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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 ] | 590 ] |
| 591 }], # end of 'enable_remoting_host' | 591 }], # end of 'enable_remoting_host' |
| 592 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 592 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 593 'targets': [ | 593 'targets': [ |
| 594 { | 594 { |
| 595 'target_name': 'remoting_webapp_browser_test', | 595 'target_name': 'remoting_webapp_browser_test', |
| 596 'type': 'none', | 596 'type': 'none', |
| 597 'variables': { | 597 'variables': { |
| 598 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.browsertest.v
2', | 598 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.browsertest.v
2', |
| 599 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.browsertest.v2.zip', | 599 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.browsertest.v2.zip', |
| 600 'webapp_type': 'v2', | |
| 601 'main_html_file': '<(SHARED_INTERMEDIATE_DIR)/browser_test/main.html
', | 600 'main_html_file': '<(SHARED_INTERMEDIATE_DIR)/browser_test/main.html
', |
| 602 'extra_files': [ | 601 'extra_files': [ |
| 603 'webapp/crd/remoting_client_pnacl.nmf.jinja2', | 602 'webapp/crd/remoting_client_pnacl.nmf.jinja2', |
| 604 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', | 603 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', |
| 605 '<@(remoting_webapp_browsertest_main_html_extra_files)', | 604 '<@(remoting_webapp_browsertest_main_html_extra_files)', |
| 606 ], | 605 ], |
| 607 }, | 606 }, |
| 608 'dependencies': [ | 607 'dependencies': [ |
| 609 'remoting_nacl.gyp:remoting_client_plugin_nacl', | 608 'remoting_nacl.gyp:remoting_client_plugin_nacl', |
| 610 'remoting_webapp_browser_test_main_html', | 609 'remoting_webapp_browser_test_main_html', |
| (...skipping 14 matching lines...) Expand all Loading... |
| 625 '../build/isolate.gypi', | 624 '../build/isolate.gypi', |
| 626 ], | 625 ], |
| 627 'sources': [ | 626 'sources': [ |
| 628 'remoting_unittests.isolate', | 627 'remoting_unittests.isolate', |
| 629 ], | 628 ], |
| 630 }, | 629 }, |
| 631 ], | 630 ], |
| 632 }], | 631 }], |
| 633 ] # end of 'conditions' | 632 ] # end of 'conditions' |
| 634 } | 633 } |
| OLD | NEW |