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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/base_untrusted.gyp

Issue 10546140: Add untrusted NaCl build for PPAPI proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gypi ('k') | base/rand_util_nacl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_untrusted.gyp
===================================================================
--- base/base_untrusted.gyp (revision 142376)
+++ base/base_untrusted.gyp (working copy)
@@ -11,7 +11,7 @@
'base.gypi',
],
'conditions': [
- ['disable_nacl_untrusted==0', {
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
'target_name': 'base_untrusted',
@@ -32,8 +32,6 @@
},
'dependencies': [
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
- '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
- '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
],
},
],
« no previous file with comments | « base/base.gypi ('k') | base/rand_util_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698