From 21f977570e42b26a9c50da35bf8d12e44645371a Mon Sep 17 00:00:00 2001 From: "bbudge@chromium.org" Date: Sat, 16 Jun 2012 00:35:01 +0000 Subject: Add untrusted NaCl build for PPAPI proxy. This patch refactors ppapi_shared.gypi and ppapi_proxy.gypi into proper includes, adds ppapi_shared_untrusted and ppapi_proxy_untrusted .gyp files, and integrates them into the nacl_irt build (ppapi/native_client/native_client.gyp). In order to build without link errors, it includes our plugin side initialization of PluginDispatcher, and a PpapiPluginMain definition. When the 'build_ppapi_ipc_proxy_untrusted' gyp flag is set to '1', this will build a working NaCl IRT using the Chrome IPC proxy. BUG=116317 TEST=compiles, runs HelloWorld and GetURL SDK examples. Review URL: https://chromiumcodereview.appspot.com/10565015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142540 0039d316-1c4b-4281-b951-d872f2087c98 --- ipc/ipc_channel.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ipc/ipc_channel.cc') diff --git a/ipc/ipc_channel.cc b/ipc/ipc_channel.cc index d81d73b..94e1cc4 100644 --- a/ipc/ipc_channel.cc +++ b/ipc/ipc_channel.cc @@ -30,16 +30,15 @@ std::string Channel::GenerateUniqueRandomChannelID() { // component. The strong random component prevents other processes from // hijacking or squatting on predictable channel names. - int process_id; #if !defined(OS_NACL) - process_id = base::GetCurrentProcId(); -#else - process_id = 0; -#endif + int process_id = base::GetCurrentProcId(); return base::StringPrintf("%d.%u.%d", process_id, g_last_id.GetNext(), base::RandInt(0, std::numeric_limits::max())); +#else + return std::string(); +#endif } } // namespace IPC -- cgit v1.1