build/config/features.gni - Issue 954383002: Enable NaCl on the Linux GN x64 release build (only).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/config/features.gni

Issue 954383002: Enable NaCl on the Linux GN x64 release build (only). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make sure the mojo/nacl targets have the "right" include dirs set Created 5 years, 10 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 side-by-side diff with in-line comments

Download patch

Index: build/config/features.gni

diff --git a/build/config/features.gni b/build/config/features.gni

index 5ee92f77f667ab959555e4ab8958ce8a4649a915..90128c4d331e61e2b2bc159dd428f411ad0afa30 100644

--- a/build/config/features.gni

+++ b/build/config/features.gni

@@ -30,10 +30,10 @@ declare_args() {

# guarded by "is_nacl" directly rather than enable_nacl_untrusted, but

# this will go away when Mac and Win are working and we can just use

# the commented out logic.

- # enable_nacl = !is_ios && !is_android

- # Currently this *should* work:

- # enable_nacl = (is_linux && build_cpu_arch == "x64") || is_nacl

- enable_nacl = false

+ # Eventually we want this to be:

+ # enable_nacl = !is_ios && !is_android

+ enable_nacl = (is_linux && !is_chromeos && !is_debug &&

+ build_cpu_arch == "x64") || is_nacl

enable_nacl_untrusted = enable_nacl

enable_pnacl = enable_nacl_untrusted

« no previous file with comments | « no previous file | mojo/nacl/BUILD.gn » ('j') | no next file with comments »