From 3375e1a876e293d8acec655fb97273399ef46091 Mon Sep 17 00:00:00 2001 From: "bbudge@chromium.org" Date: Fri, 15 Jun 2012 22:15:53 +0000 Subject: 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 --- base/base_untrusted.gyp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'base/base_untrusted.gyp') diff --git a/base/base_untrusted.gyp b/base/base_untrusted.gyp index 44baaa1..16aef58 100644 --- a/base/base_untrusted.gyp +++ b/base/base_untrusted.gyp @@ -11,7 +11,7 @@ 'base.gypi', ], 'conditions': [ - ['disable_nacl==0 and disable_nacl_untrusted==0', { + ['disable_nacl_untrusted==0', { 'targets': [ { 'target_name': 'base_untrusted', @@ -32,6 +32,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', ], }, ], -- cgit v1.1