| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../native_client/build/untrusted.gypi', | 10 '../native_client/build/untrusted.gypi', |
| 11 'ppapi_ipc.gypi', |
| 11 ], | 12 ], |
| 12 'conditions': [ | 13 'conditions': [ |
| 13 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 14 'targets': [ | 15 'targets': [ |
| 15 { | 16 { |
| 16 'target_name': 'shared_memory_support_untrusted', | 17 'target_name': 'ppapi_ipc_untrusted', |
| 17 'type': 'none', | 18 'type': 'none', |
| 18 'variables': { | 19 'variables': { |
| 20 'ppapi_ipc_target': 1, |
| 21 'nacl_win64_target': 0, |
| 19 'nacl_untrusted_build': 1, | 22 'nacl_untrusted_build': 1, |
| 20 'nlib_target': 'libshared_memory_support_untrusted.a', | 23 'nlib_target': 'libppapi_ipc_untrusted.a', |
| 21 'build_glibc': 0, | 24 'build_glibc': 0, |
| 22 'build_newlib': 1, | 25 'build_newlib': 1, |
| 23 }, | 26 }, |
| 24 'dependencies': [ | |
| 25 '../native_client/tools.gyp:prep_toolchain', | |
| 26 '../base/base_untrusted.gyp:base_untrusted', | |
| 27 ], | |
| 28 'defines': [ | 27 'defines': [ |
| 29 'MEDIA_IMPLEMENTATION', | 28 'NACL_PPAPI_IPC_PROXY', |
| 30 ], | 29 ], |
| 31 'include_dirs': [ | 30 'include_dirs': [ |
| 32 '..', | 31 '..', |
| 33 ], | 32 ], |
| 34 'includes': [ | 33 'dependencies': [ |
| 35 'shared_memory_support.gypi', | 34 '../native_client/tools.gyp:prep_toolchain', |
| 36 ], | 35 '../base/base_untrusted.gyp:base_untrusted', |
| 37 'sources': [ | 36 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', |
| 38 '<@(shared_memory_support_sources)', | 37 '../ipc/ipc_untrusted.gyp:ipc_untrusted', |
| 38 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', |
| 39 ], | 39 ], |
| 40 }, | 40 }, |
| 41 ], | 41 ], |
| 42 }], | 42 }], |
| 43 ], | 43 ], |
| 44 } | 44 } |
| OLD | NEW |