base/base.gypi - Issue 299703016: Gate disabling nacl code on proper gyp flags, etc.

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: base/base.gypi

Issue 299703016: Gate disabling nacl code on proper gyp flags, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix guard on flags code Created 6 years, 7 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:

Index: base/base.gypi

diff --git a/base/base.gypi b/base/base.gypi

index d0b7370a9acf32c3536e5b10470808330fe43a45..81443540e7164a5b40c6df90a221bbd9b0ee5d0a 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -772,7 +772,7 @@

['include', '^threading/platform_thread_linux\\.cc$'],

}],

- ['OS == "android" and _toolset == "target"', {

+ ['OS == "android" and _toolset == "target" and >(nacl_untrusted_build)==0', {

'sources': [

'memory/discardable_memory_ashmem_allocator.cc',

'memory/discardable_memory_ashmem_allocator.h',

« no previous file with comments | « no previous file | build/build_config.h » ('j') | no next file with comments »