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

Unified Diff: build/all.gyp

Issue 10825351: Revert 151581 - Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI prox… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 151583)
+++ build/all.gyp (working copy)
@@ -156,6 +156,14 @@
'../net/third_party/nss/ssl.gyp:*',
],
}],
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '../base/base_untrusted.gyp:*',
+ '../ipc/ipc_untrusted.gyp:*',
+ '../ppapi/ppapi_proxy_untrusted.gyp:*',
+ '../ppapi/ppapi_shared_untrusted.gyp:*',
+ ],
+ }],
],
}, # target_name: All
{
@@ -236,6 +244,12 @@
'../sandbox/sandbox.gyp:sandbox_linux_unittests',
],
}],
+ ['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 | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698