build/all.gyp - Issue 10565014: repair disable_nacl=1

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/all.gyp

Issue 10565014: repair disable_nacl=1 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: other _untrusted.gyp files Created 8 years, 6 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: build/all.gyp

diff --git a/build/all.gyp b/build/all.gyp

index 5eb6977d09329b53cda7973cd096594c156d5e8c..b378514059b78a0c864cfcf3d52afeca0f314823 100644

--- a/build/all.gyp

+++ b/build/all.gyp

@@ -191,8 +191,6 @@

'../jingle/jingle.gyp:jingle_unittests',

'../media/media.gyp:media_unittests',

'../net/net.gyp:net_unittests',

- # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC.

- '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',

'../printing/printing.gyp:printing_unittests',

'../remoting/remoting.gyp:remoting_unittests',

'../sql/sql.gyp:sql_unittests',

@@ -224,6 +222,12 @@

'../webkit/webkit.gyp:test_shell_common',

}],

+ ['disable_nacl==0 and disable_nacl_untrusted==0', {

+ 'dependencies': [

+ # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC.

+ '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',

+ ],

+ }],

}, # target_name: chromium_builder_tests

{

« no previous file with comments | « base/base_untrusted.gyp ('k') | ipc/ipc_untrusted.gyp » ('j') | no next file with comments »