diff options
| author | dpranke <dpranke@chromium.org> | 2016-03-24 16:43:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 23:45:14 +0000 |
| commit | fad8e464eda52dcd079f58a6fc4ccaee1955bcd3 (patch) | |
| tree | eb4517e7c8cf18191a751c5c9f161ea68361502c /remoting | |
| parent | 6d221f22e58f3706147d2c8d5cec7b9fd2b3566b (diff) | |
| download | chromium_src-fad8e464eda52dcd079f58a6fc4ccaee1955bcd3.zip chromium_src-fad8e464eda52dcd079f58a6fc4ccaee1955bcd3.tar.gz chromium_src-fad8e464eda52dcd079f58a6fc4ccaee1955bcd3.tar.bz2 | |
Temporarily disable remoting_client_plugin_newlib on win in GN builds.
Trying to build this causes out-of-memory issues with the pnacl
linker, likely because it's a 32-bit tool and the GN builds are
using source_sets instead of static_libraries, causing us to
link in a lot more code before it can get gc'ed.
Disabling temporarily until I have cycles to look at this, because
it keeps `gn_all` from building.
R=brucedawson@chromium.org, mcgrathr@chromium.org, sergeyu@chromium.org
BUG=584516
Review URL: https://codereview.chromium.org/1830113004
Cr-Commit-Position: refs/heads/master@{#383191}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/build_template.gni | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/webapp/build_template.gni b/remoting/webapp/build_template.gni index 48dc9c6..3fcf0aa 100644 --- a/remoting/webapp/build_template.gni +++ b/remoting/webapp/build_template.gni @@ -225,7 +225,8 @@ template("desktop_remoting_webapp") { "$target_gen_dir/credits.html", ] - if (enable_nacl) { + # TODO(crbug.com/584516) - fix OOM issues and re-enable on win. + if (enable_nacl && !is_win) { pnacl_tc = "//build/toolchain/nacl:newlib_pnacl" pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib" pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir") @@ -256,7 +257,8 @@ template("desktop_remoting_webapp") { "//remoting/webapp:credits", ] - if (enable_nacl) { + # TODO(crbug.com/584516) - fix OOM issues and re-enable on win. + if (enable_nacl && !is_win) { deps += [ "${pexe_label}($pnacl_tc)" ] if (is_debug) { deps += [ "${pexe_label}_debug($pnacl_tc)" ] |