Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi.

ppapi/nacl_irt/plugin_main.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/plugin_main.h"
 
 #include "build/build_config.h"
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the
@@ skipping 15 matching lines @@
     const struct PP_ThreadFunctions* thread_functions) {
   // Initialize all classes that need to create threads that call back into
   // user code.
   ppapi::PPB_Audio_Shared::SetThreadFunctions(thread_functions);
 }
 
 int PpapiPluginMain() {
   base::MessageLoop loop;
   ppapi::proxy::PluginGlobals plugin_globals;
 
-#if defined(__native_client__)
+#if defined(__native_client__) && !defined(__native_client_nonsfi__)

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

Similarly, OS_NACL_SFI.  You might as well commit your other change first to
reduce churn here.

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

Done.

   // Currently on non-SFI mode, we don't use SRPC server on plugin.
   // TODO(hidehiko): Make sure this SRPC is actually used on SFI-mode.
 
   // Start up the SRPC server on another thread. Otherwise, when it blocks
   // on an RPC, the PPAPI proxy will hang. Do this before we initialize the
   // module and start the PPAPI proxy so that the NaCl plugin can continue
   // loading the app.
   static struct NaClSrpcHandlerDesc srpc_methods[] = { { NULL, NULL } };
   if (!NaClSrpcAcceptClientOnThread(srpc_methods)) {
     return 1;
   }
 #endif
 
   ppapi::PpapiDispatcher ppapi_dispatcher(
       ppapi::GetIOThread()->message_loop_proxy(),
       ppapi::GetShutdownEvent(),
       ppapi::GetBrowserIPCFileDescriptor(),
       ppapi::GetRendererIPCFileDescriptor());
   plugin_globals.SetPluginProxyDelegate(&ppapi_dispatcher);
 
   loop.Run();
 
   return 0;
 }