| Index: media/media_untrusted.gyp
|
| diff --git a/ppapi/ppapi_shared_untrusted.gyp b/media/media_untrusted.gyp
|
| similarity index 60%
|
| copy from ppapi/ppapi_shared_untrusted.gyp
|
| copy to media/media_untrusted.gyp
|
| index 54c694a16423c4d67524e6b18083bbd637a0b28e..4abbe5666609a09f87da88bb73a0990ae69efd54 100644
|
| --- a/ppapi/ppapi_shared_untrusted.gyp
|
| +++ b/media/media_untrusted.gyp
|
| @@ -7,35 +7,35 @@
|
| 'chromium_code': 1,
|
| },
|
| 'includes': [
|
| - '../build/common_untrusted.gypi',
|
| - 'ppapi_shared.gypi',
|
| + '../native_client/build/untrusted.gypi',
|
| ],
|
| 'conditions': [
|
| ['disable_nacl==0 and disable_nacl_untrusted==0', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'ppapi_shared_untrusted',
|
| + 'target_name': 'shared_memory_support_untrusted',
|
| 'type': 'none',
|
| 'variables': {
|
| - 'ppapi_shared_target': 1,
|
| 'nacl_untrusted_build': 1,
|
| - 'nlib_target': 'libppapi_shared_untrusted.a',
|
| + 'nlib_target': 'libshared_memory_support_untrusted.a',
|
| 'build_glibc': 0,
|
| 'build_newlib': 1,
|
| },
|
| + 'dependencies': [
|
| + '../native_client/tools.gyp:prep_toolchain',
|
| + '../base/base_untrusted.gyp:base_untrusted',
|
| + ],
|
| 'defines': [
|
| - 'NACL_PPAPI_IPC_PROXY',
|
| + 'MEDIA_IMPLEMENTATION',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| - '../third_party/khronos',
|
| ],
|
| - 'dependencies': [
|
| - '../native_client/tools.gyp:prep_toolchain',
|
| - '../base/base_untrusted.gyp:base_untrusted',
|
| - '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
|
| - '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted',
|
| - '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
|
| + 'includes': [
|
| + 'shared_memory_support.gypi',
|
| + ],
|
| + 'sources': [
|
| + '<@(shared_memory_support_sources)',
|
| ],
|
| },
|
| ],
|
|
|