Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: ppapi/ppapi_ipc_untrusted.gyp

Issue 10828023: PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-add gyp files Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/ppapi_ipc_proxy_untrusted.gyp ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/ppapi_ipc_untrusted.gyp
diff --git a/media/media_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp
similarity index 66%
copy from media/media_untrusted.gyp
copy to ppapi/ppapi_ipc_untrusted.gyp
index 4abbe5666609a09f87da88bb73a0990ae69efd54..ec6fdf907f0afeb16bc76e2ff6deff8e9144f8cd 100644
--- a/media/media_untrusted.gyp
+++ b/ppapi/ppapi_ipc_untrusted.gyp
@@ -8,34 +8,34 @@
},
'includes': [
'../native_client/build/untrusted.gypi',
+ 'ppapi_ipc.gypi',
],
'conditions': [
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
- 'target_name': 'shared_memory_support_untrusted',
+ 'target_name': 'ppapi_ipc_untrusted',
'type': 'none',
'variables': {
+ 'ppapi_ipc_target': 1,
+ 'nacl_win64_target': 0,
'nacl_untrusted_build': 1,
- 'nlib_target': 'libshared_memory_support_untrusted.a',
+ 'nlib_target': 'libppapi_ipc_untrusted.a',
'build_glibc': 0,
'build_newlib': 1,
},
- 'dependencies': [
- '../native_client/tools.gyp:prep_toolchain',
- '../base/base_untrusted.gyp:base_untrusted',
- ],
'defines': [
- 'MEDIA_IMPLEMENTATION',
+ 'NACL_PPAPI_IPC_PROXY',
],
'include_dirs': [
'..',
],
- 'includes': [
- 'shared_memory_support.gypi',
- ],
- 'sources': [
- '<@(shared_memory_support_sources)',
+ 'dependencies': [
+ '../native_client/tools.gyp:prep_toolchain',
+ '../base/base_untrusted.gyp:base_untrusted',
+ '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
+ '../ipc/ipc_untrusted.gyp:ipc_untrusted',
+ '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
],
},
],
« no previous file with comments | « ppapi/ppapi_ipc_proxy_untrusted.gyp ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698