Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi.

ppapi/nacl_irt/manifest_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/nacl_irt/manifest_service.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_message_filter.h"
@@ skipping 86 matching lines @@
   if (!filter_->Send(new PpapiHostMsg_OpenResource(
           std::string(kFilePrefix) + file,
           &ipc_fd,
           &file_token_lo,
           &file_token_hi))) {
     LOG(ERROR) << "ManifestService::OpenResource failed:" << file;
     *fd = -1;
     return false;
   }
 
-#if defined(OS_NACL)
+#if defined(OS_NACL) && !defined(__native_client_nonsfi__)

[Mark Seaborn, 2014/10/27 18:59:07]

Can use OS_NACL_SFI once your other change is committed.

[hidehiko, 2014/10/28 20:14:00]

Done.

   // File tokens are used internally by NaClIPCAdapter and should have
   // been cleared from the message when it is received here.
   // Note that, on Non-SFI NaCl, the IPC channel is directly connected to the
   // renderer process, so NaClIPCAdapter does not work. It means,
   // file_token_{lo,hi} fields may be properly filled, although it is just
   // ignored here.
   CHECK(file_token_lo == 0);
   CHECK(file_token_hi == 0);
 #endif
 
@@ skipping 14 matching lines @@
 
   ManifestService* manifest_service = GetManifestService();
   if (manifest_service == NULL ||
       !manifest_service->OpenResource(file, fd)) {
     return NACL_ABI_EIO;
   }
   return (*fd == -1) ? NACL_ABI_ENOENT : 0;
 }
 
 }  // namespace ppapi