diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 19:00:31 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 19:00:31 +0000 |
commit | d8c7cbccd6557ed455d9d4a212a2824972072505 (patch) | |
tree | ff9261a8931be3775c6c3786c4527a30cf6b5676 /chrome/browser/nacl_process_host.cc | |
parent | 21e8556f0651a4e132fde29bc4738229eaa3305b (diff) | |
download | chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.zip chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.gz chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.bz2 |
Add an option to disable NaCl at compile time for platforms where it doesn't build yet
Just add disable_nacl=1 to gyp defines
Review URL: http://codereview.chromium.org/257029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_process_host.cc')
-rw-r--r-- | chrome/browser/nacl_process_host.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_process_host.cc index 72db561..bb13ab7 100644 --- a/chrome/browser/nacl_process_host.cc +++ b/chrome/browser/nacl_process_host.cc @@ -39,6 +39,10 @@ NaClProcessHost::NaClProcessHost( bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter, const int descriptor, nacl::FileDescriptor* handle) { +#ifdef DISABLE_NACL + NOTIMPLEMENTED() << "Native Client disabled at build time"; + return false; +#else nacl::Handle pair[2]; bool success = false; // Create a connected socket @@ -80,6 +84,7 @@ bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter, #endif return true; +#endif // DISABLE_NACL } bool NaClProcessHost::LaunchSelLdr(ResourceMessageFilter* renderer_msg_filter, @@ -184,4 +189,3 @@ URLRequestContext* NaClProcessHost::GetRequestContext( const ViewHostMsg_Resource_Request& request_data) { return NULL; } - |