| 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/client | 8 # GN version: //remoting/client |
| 9 'target_name': 'remoting_client', | 9 'target_name': 'remoting_client', |
| 10 'type': 'static_library', | 10 'type': 'static_library', |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 }, | 153 }, |
| 154 ], | 154 ], |
| 155 }, | 155 }, |
| 156 { | 156 { |
| 157 # GN version: //remoting/webapp | 157 # GN version: //remoting/webapp |
| 158 'target_name': 'remoting_webapp', | 158 'target_name': 'remoting_webapp', |
| 159 'type': 'none', | 159 'type': 'none', |
| 160 'variables': { | 160 'variables': { |
| 161 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2', | 161 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2', |
| 162 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip', | 162 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip', |
| 163 'webapp_type': 'desktop', | |
| 164 'extra_files': [ | 163 'extra_files': [ |
| 165 'webapp/crd/remoting_client_pnacl.nmf.jinja2', | 164 'webapp/crd/remoting_client_pnacl.nmf.jinja2', |
| 166 ], | 165 ], |
| 167 }, | 166 }, |
| 168 'conditions': [ | 167 'conditions': [ |
| 169 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 168 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 170 'variables': { | 169 'variables': { |
| 171 'extra_files': [ | 170 'extra_files': [ |
| 172 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', | 171 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', |
| 173 ], | 172 ], |
| 174 }, | 173 }, |
| 175 'dependencies': [ | 174 'dependencies': [ |
| 176 'remoting_nacl.gyp:remoting_client_plugin_nacl', | 175 'remoting_nacl.gyp:remoting_client_plugin_nacl', |
| 177 ], | 176 ], |
| 178 }], | 177 }], |
| 179 ['disable_nacl==0 and disable_nacl_untrusted==0 and buildtype == "Dev"',
{ | 178 ['disable_nacl==0 and disable_nacl_untrusted==0 and buildtype == "Dev"',
{ |
| 180 'variables': { | 179 'variables': { |
| 181 'extra_files': [ | 180 'extra_files': [ |
| 182 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug', | 181 '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug', |
| 183 ], | 182 ], |
| 184 }, | 183 }, |
| 185 }], | 184 }], |
| 186 ], | 185 ], |
| 187 'includes': [ 'remoting_webapp.gypi', ], | 186 'includes': [ 'remoting_webapp.gypi', ], |
| 188 }, # end of target 'remoting_webapp' | 187 }, # end of target 'remoting_webapp' |
| 189 ], # end of targets | 188 ], # end of targets |
| 190 } | 189 } |
| OLD | NEW |