diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:34:51 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:34:51 +0000 |
| commit | cf1d779fbf1582c77df145de5ec02cd7a9f25612 (patch) | |
| tree | 37810ddc0425638b2b6a86fd2f08da041c5f4500 /build | |
| parent | 3420503c0eb45fb0a2f8ec6316acbe9409f4c361 (diff) | |
| download | chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.zip chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.tar.gz chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index 445287b..5eb6977 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -11,6 +11,7 @@ 'dependencies': [ 'some.gyp:*', '../base/base.gyp:*', + '../base/base_untrusted.gyp:*', '../chrome/chrome.gyp:*', '../content/content.gyp:*', '../crypto/crypto.gyp:*', @@ -187,12 +188,11 @@ '../gpu/gpu.gyp:gpu_unittests', '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', '../ipc/ipc.gyp:ipc_tests', - # TODO(bbudge): drop this when something meaningful depends on - # ipc_untrusted. - '../ipc/ipc_untrusted.gyp:ipc_untrusted', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', + # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC. + '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../sql/sql.gyp:sql_unittests', |