diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 22:15:53 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 22:15:53 +0000 |
| commit | 3375e1a876e293d8acec655fb97273399ef46091 (patch) | |
| tree | a7cc81377be61f901bbc093462af182f8a7cfff2 /ipc | |
| parent | ced8e8d8ccea289ce8dde43aa04617f417f63596 (diff) | |
| download | chromium_src-3375e1a876e293d8acec655fb97273399ef46091.zip chromium_src-3375e1a876e293d8acec655fb97273399ef46091.tar.gz chromium_src-3375e1a876e293d8acec655fb97273399ef46091.tar.bz2 | |
Revert 142482 - 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/10546140
TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10565012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_channel.cc | 9 | ||||
| -rw-r--r-- | ipc/ipc_untrusted.gyp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ipc/ipc_channel.cc b/ipc/ipc_channel.cc index 94e1cc4..d81d73b 100644 --- a/ipc/ipc_channel.cc +++ b/ipc/ipc_channel.cc @@ -30,15 +30,16 @@ 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) - int process_id = base::GetCurrentProcId(); + process_id = base::GetCurrentProcId(); +#else + process_id = 0; +#endif return base::StringPrintf("%d.%u.%d", process_id, g_last_id.GetNext(), base::RandInt(0, std::numeric_limits<int32>::max())); -#else - return std::string(); -#endif } } // namespace IPC diff --git a/ipc/ipc_untrusted.gyp b/ipc/ipc_untrusted.gyp index dd389d4..5a6a6ff 100644 --- a/ipc/ipc_untrusted.gyp +++ b/ipc/ipc_untrusted.gyp @@ -11,7 +11,7 @@ 'ipc.gypi', ], 'conditions': [ - ['disable_nacl==0 and disable_nacl_untrusted==0', { + ['disable_nacl_untrusted==0', { 'targets': [ { 'target_name': 'ipc_untrusted', @@ -25,6 +25,8 @@ }, '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', '../base/base_untrusted.gyp:base_untrusted', ], }, |