| 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 # File included in remoting_webapp_* targets in remoting_client.gypi | 5 # File included in remoting_webapp_* targets in remoting_client.gypi |
| 6 | 6 |
| 7 { | 7 { |
| 8 'type': 'none', | 8 'type': 'none', |
| 9 'variables': { | 9 'variables': { |
| 10 'include_host_plugin%': 0, | 10 'include_host_plugin%': 0, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 'plugin_args': [ | 28 'plugin_args': [ |
| 29 '--locales', '<@(remoting_host_locale_files)', | 29 '--locales', '<@(remoting_host_locale_files)', |
| 30 '--plugin', '<(plugin_path)', | 30 '--plugin', '<(plugin_path)', |
| 31 ], | 31 ], |
| 32 }, | 32 }, |
| 33 }, { | 33 }, { |
| 34 'variables': { | 34 'variables': { |
| 35 'plugin_args': [], | 35 'plugin_args': [], |
| 36 }, | 36 }, |
| 37 }], | 37 }], |
| 38 ['webapp_type=="v2_pnacl"', { | |
| 39 'dependencies': [ | |
| 40 'remoting_nacl.gyp:remoting_client_plugin_nacl', | |
| 41 ], | |
| 42 'variables': { | |
| 43 'extra_files': [ | |
| 44 'webapp/remoting_client_pnacl.nmf', | |
| 45 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', | |
| 46 ], | |
| 47 }, | |
| 48 }], | |
| 49 ['run_jscompile != 0', { | 38 ['run_jscompile != 0', { |
| 50 'variables': { | 39 'variables': { |
| 51 'success_stamp': '<(PRODUCT_DIR)/remoting_webapp_jscompile.stamp', | 40 'success_stamp': '<(PRODUCT_DIR)/remoting_webapp_jscompile.stamp', |
| 52 }, | 41 }, |
| 53 'actions': [ | 42 'actions': [ |
| 54 { | 43 { |
| 55 'action_name': 'Verify remoting webapp', | 44 'action_name': 'Verify remoting webapp', |
| 56 'inputs': [ | 45 'inputs': [ |
| 57 '<@(remoting_webapp_all_js_files)', | 46 '<@(remoting_webapp_all_js_files)', |
| 58 '<@(remoting_webapp_js_proto_files)', | 47 '<@(remoting_webapp_js_proto_files)', |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 '<(webapp_type)', | 95 '<(webapp_type)', |
| 107 '<@(generated_html_files)', | 96 '<@(generated_html_files)', |
| 108 '<@(remoting_webapp_files)', | 97 '<@(remoting_webapp_files)', |
| 109 '<@(extra_files)', | 98 '<@(extra_files)', |
| 110 '<@(plugin_args)', | 99 '<@(plugin_args)', |
| 111 '--locales', '<@(remoting_webapp_locale_files)', | 100 '--locales', '<@(remoting_webapp_locale_files)', |
| 112 ], | 101 ], |
| 113 }, | 102 }, |
| 114 ], | 103 ], |
| 115 } | 104 } |
| OLD | NEW |