diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 00:35:01 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 00:35:01 +0000 |
| commit | 21f977570e42b26a9c50da35bf8d12e44645371a (patch) | |
| tree | 79d2c7ceb5dd24a3ddef8a02590a2786e6768b0e /build/all.gyp | |
| parent | 8df26d4b2c07009cca88c4082bee5a4acff16a77 (diff) | |
| download | chromium_src-21f977570e42b26a9c50da35bf8d12e44645371a.zip chromium_src-21f977570e42b26a9c50da35bf8d12e44645371a.tar.gz chromium_src-21f977570e42b26a9c50da35bf8d12e44645371a.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/10565015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index 445287b..273027c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -18,13 +18,11 @@ '../gpu/gpu.gyp:*', '../gpu/tools/tools.gyp:*', '../ipc/ipc.gyp:*', - '../ipc/ipc_untrusted.gyp:*', '../jingle/jingle.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', '../ppapi/ppapi.gyp:*', '../ppapi/ppapi_internal.gyp:*', - '../ppapi/ppapi_proxy_untrusted.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -145,6 +143,14 @@ '../net/third_party/nss/ssl.gyp:*', ], }], + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'dependencies': [ + '../base/base_untrusted.gyp:*', + '../ipc/ipc_untrusted.gyp:*', + '../ppapi/ppapi_proxy_untrusted.gyp:*', + '../ppapi/ppapi_shared_untrusted.gyp:*', + ], + }], ], }, # target_name: All { @@ -187,9 +193,6 @@ '../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', @@ -224,6 +227,12 @@ '../webkit/webkit.gyp:test_shell_common', ], }], + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'dependencies': [ + # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC. + '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted', + ], + }], ], }, # target_name: chromium_builder_tests { |