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

Unified Diff: ppapi/native_client/native_client.gyp

Issue 8905007: Put irt and untrusted TC dependencies behind a flag. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years 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
« no previous file with comments | « chrome/nacl.gypi ('k') | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/native_client.gyp
===================================================================
--- ppapi/native_client/native_client.gyp (revision 114228)
+++ ppapi/native_client/native_client.gyp (working copy)
@@ -7,7 +7,7 @@
'../../native_client/build/common.gypi',
],
'conditions': [
- ['disable_nacl!=1', {
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
'target_name': 'ppapi_lib',
@@ -79,7 +79,7 @@
],
},
'dependencies': [
- 'src/shared/ppapi_proxy/ppapi_proxy.gyp:ppruntime_lib',
+ 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib',
'../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
'../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
'../../native_client/src/shared/platform/platform.gyp:platform_lib',
« no previous file with comments | « chrome/nacl.gypi ('k') | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698