Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1529)

Side by Side Diff: remoting/webapp/build_template.gni

Issue 1830113004: Temporarily disable remoting_client_plugin_newlib on win in GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 if (enable_nacl) { 228 # TODO(crbug.com/584516) - fix OOM issues and re-enable on win.
229 if (enable_nacl && !is_win) {
229 pnacl_tc = "//build/toolchain/nacl:newlib_pnacl" 230 pnacl_tc = "//build/toolchain/nacl:newlib_pnacl"
230 pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib" 231 pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib"
231 pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir") 232 pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir")
232 233
233 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ] 234 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ]
234 if (is_debug) { 235 if (is_debug) {
235 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe.debug" ] 236 extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe.debug" ]
236 } 237 }
237 } 238 }
238 239
(...skipping 10 matching lines...) Expand all
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 if (enable_nacl) { 260 # TODO(crbug.com/584516) - fix OOM issues and re-enable on win.
261 if (enable_nacl && !is_win) {
260 deps += [ "${pexe_label}($pnacl_tc)" ] 262 deps += [ "${pexe_label}($pnacl_tc)" ]
261 if (is_debug) { 263 if (is_debug) {
262 deps += [ "${pexe_label}_debug($pnacl_tc)" ] 264 deps += [ "${pexe_label}_debug($pnacl_tc)" ]
263 } 265 }
264 } 266 }
265 267
266 # Create a file that contains a list of all the resource files needed 268 # Create a file that contains a list of all the resource files needed
267 # to build the webapp. This is needed to avoid problems on platforms that 269 # to build the webapp. This is needed to avoid problems on platforms that
268 # limit the size of a command line. 270 # limit the size of a command line.
269 file_list = "$target_gen_dir/${target_name}_files.txt" 271 file_list = "$target_gen_dir/${target_name}_files.txt"
(...skipping 17 matching lines...) Expand all
287 args += [ 289 args += [
288 "--locales_listfile", 290 "--locales_listfile",
289 rebase_path(locales_listfile_output, root_build_dir), 291 rebase_path(locales_listfile_output, root_build_dir),
290 ] 292 ]
291 args += [ 293 args += [
292 "--use_gcd", 294 "--use_gcd",
293 "$remoting_use_gcd", 295 "$remoting_use_gcd",
294 ] 296 ]
295 } 297 }
296 } 298 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698