OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi. | 5 # Keep in sync with 'remoting_webapp' target in remoting/remoting_client.gypi. |
6 | 6 |
7 import("//build/config/chrome_build.gni") | 7 import("//build/config/chrome_build.gni") |
8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
9 import("//build/util/version.gni") | 9 import("//build/util/version.gni") |
10 import("//remoting/remoting_locales.gni") | 10 import("//remoting/remoting_locales.gni") |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 218 |
219 dr_generated_html_files = [ | 219 dr_generated_html_files = [ |
220 background_html_output, | 220 background_html_output, |
221 message_window_html_output, | 221 message_window_html_output, |
222 wcs_sandbox_html_output, | 222 wcs_sandbox_html_output, |
223 main_html_output, | 223 main_html_output, |
224 public_session_html_output, | 224 public_session_html_output, |
225 "$target_gen_dir/credits.html", | 225 "$target_gen_dir/credits.html", |
226 ] | 226 ] |
227 | 227 |
228 # TODO(crbug.com/584516) - fix OOM issues and re-enable on win. | 228 # Windows debug builds of remoting_client_plugin_newlib.pexe trigger OOM in |
229 if (enable_nacl && !is_win) { | 229 # arm-nacl-ld.gold.exe - enable for release builds only on Windows. |
| 230 if (enable_nacl && (!is_win || !is_debug)) { |
230 pnacl_tc = "//build/toolchain/nacl:newlib_pnacl" | 231 pnacl_tc = "//build/toolchain/nacl:newlib_pnacl" |
231 pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib" | 232 pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib" |
232 pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir") | 233 pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir") |
233 | 234 |
234 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ] | 235 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ] |
235 if (is_debug) { | 236 if (is_debug) { |
236 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe.debug" ] | 237 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe.debug" ] |
237 } | 238 } |
238 } | 239 } |
239 | 240 |
240 inputs = [ rebase_path("crd/manifest.json.jinja2") ] + | 241 inputs = [ rebase_path("crd/manifest.json.jinja2") ] + |
241 remoting_version_files + rebase_path(remoting_webapp_crd_files) + | 242 remoting_version_files + rebase_path(remoting_webapp_crd_files) + |
242 extra_files + dr_generated_html_files | 243 extra_files + dr_generated_html_files |
243 | 244 |
244 outputs = [ | 245 outputs = [ |
245 zip_path, | 246 zip_path, |
246 ] | 247 ] |
247 | 248 |
248 deps = [ | 249 deps = [ |
249 ":$background_html", | 250 ":$background_html", |
250 ":$locales_listfile", | 251 ":$locales_listfile", |
251 ":$main_html", | 252 ":$main_html", |
252 ":$message_window_html", | 253 ":$message_window_html", |
253 ":$public_session_html", | 254 ":$public_session_html", |
254 ":$wcs_sandbox_html", | 255 ":$wcs_sandbox_html", |
255 "//remoting/resources", | 256 "//remoting/resources", |
256 "//remoting/webapp:credits", | 257 "//remoting/webapp:credits", |
257 ] | 258 ] |
258 | 259 |
259 # TODO(crbug.com/584516) - fix OOM issues and re-enable on win. | 260 # Windows debug builds of remoting_client_plugin_newlib.pexe trigger OOM in |
260 if (enable_nacl && !is_win) { | 261 # arm-nacl-ld.gold.exe - enable for release builds only on Windows. |
| 262 if (enable_nacl && (!is_win || !is_debug)) { |
261 deps += [ "${pexe_label}($pnacl_tc)" ] | 263 deps += [ "${pexe_label}($pnacl_tc)" ] |
262 if (is_debug) { | 264 if (is_debug) { |
263 deps += [ "${pexe_label}_debug($pnacl_tc)" ] | 265 deps += [ "${pexe_label}_debug($pnacl_tc)" ] |
264 } | 266 } |
265 } | 267 } |
266 | 268 |
267 # Create a file that contains a list of all the resource files needed | 269 # Create a file that contains a list of all the resource files needed |
268 # to build the webapp. This is needed to avoid problems on platforms that | 270 # to build the webapp. This is needed to avoid problems on platforms that |
269 # limit the size of a command line. | 271 # limit the size of a command line. |
270 file_list = "$target_gen_dir/${target_name}_files.txt" | 272 file_list = "$target_gen_dir/${target_name}_files.txt" |
(...skipping 17 matching lines...) Expand all Loading... |
288 args += [ | 290 args += [ |
289 "--locales_listfile", | 291 "--locales_listfile", |
290 rebase_path(locales_listfile_output, root_build_dir), | 292 rebase_path(locales_listfile_output, root_build_dir), |
291 ] | 293 ] |
292 args += [ | 294 args += [ |
293 "--use_gcd", | 295 "--use_gcd", |
294 "$remoting_use_gcd", | 296 "$remoting_use_gcd", |
295 ] | 297 ] |
296 } | 298 } |
297 } | 299 } |
OLD | NEW |