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: http://src.chromium.org/svn/trunk/src/build@142540 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
bbudge@chromium.org 2012-06-16 00:35:01 +00:00
Родитель 06b4443916
Коммит 8afdaf3d9a
1 изменённых файлов: 14 добавлений и 5 удалений

19
all.gyp
Просмотреть файл

@ -18,13 +18,11 @@
'../gpu/gpu.gyp:*', '../gpu/gpu.gyp:*',
'../gpu/tools/tools.gyp:*', '../gpu/tools/tools.gyp:*',
'../ipc/ipc.gyp:*', '../ipc/ipc.gyp:*',
'../ipc/ipc_untrusted.gyp:*',
'../jingle/jingle.gyp:*', '../jingle/jingle.gyp:*',
'../media/media.gyp:*', '../media/media.gyp:*',
'../net/net.gyp:*', '../net/net.gyp:*',
'../ppapi/ppapi.gyp:*', '../ppapi/ppapi.gyp:*',
'../ppapi/ppapi_internal.gyp:*', '../ppapi/ppapi_internal.gyp:*',
'../ppapi/ppapi_proxy_untrusted.gyp:*',
'../printing/printing.gyp:*', '../printing/printing.gyp:*',
'../sdch/sdch.gyp:*', '../sdch/sdch.gyp:*',
'../skia/skia.gyp:*', '../skia/skia.gyp:*',
@ -145,6 +143,14 @@
'../net/third_party/nss/ssl.gyp:*', '../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 }, # target_name: All
{ {
@ -187,9 +193,6 @@
'../gpu/gpu.gyp:gpu_unittests', '../gpu/gpu.gyp:gpu_unittests',
'../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
'../ipc/ipc.gyp:ipc_tests', '../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', '../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests', '../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests', '../net/net.gyp:net_unittests',
@ -224,6 +227,12 @@
'../webkit/webkit.gyp:test_shell_common', '../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 }, # target_name: chromium_builder_tests
{ {