| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 '../build/common_untrusted.gypi', | 10 '../build/common_untrusted.gypi', |
| 11 'ipc.gypi', | 11 'ipc.gypi', |
| 12 ], | 12 ], |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 15 'targets': [ | 15 'targets': [ |
| 16 { | 16 { |
| 17 'target_name': 'ipc_nacl', | 17 'target_name': 'ipc_nacl', |
| 18 'type': 'none', | 18 'type': 'none', |
| 19 'variables': { | 19 'variables': { |
| 20 'ipc_target': 1, | 20 'ipc_target': 1, |
| 21 'nacl_untrusted_build': 1, | 21 'nacl_untrusted_build': 1, |
| 22 'nlib_target': 'libipc_nacl.a', | 22 'nlib_target': 'libipc_nacl.a', |
| 23 'build_glibc': 0, | 23 'build_glibc': 0, |
| 24 'build_newlib': 0, | 24 'build_newlib': 0, |
| 25 'build_irt': 1, | 25 'build_irt': 1, |
| 26 }, | 26 }, |
| 27 'dependencies': [ | 27 'dependencies': [ |
| 28 'ipc.gyp:ipc_interfaces', |
| 28 '../base/base_nacl.gyp:base_nacl', | 29 '../base/base_nacl.gyp:base_nacl', |
| 29 ], | 30 ], |
| 30 }, | 31 }, |
| 31 { | 32 { |
| 32 'target_name': 'ipc_nacl_nonsfi', | 33 'target_name': 'ipc_nacl_nonsfi', |
| 33 'type': 'none', | 34 'type': 'none', |
| 34 'variables': { | 35 'variables': { |
| 35 'ipc_target': 1, | 36 'ipc_target': 1, |
| 36 'nacl_untrusted_build': 1, | 37 'nacl_untrusted_build': 1, |
| 37 'nlib_target': 'libipc_nacl_nonsfi.a', | 38 'nlib_target': 'libipc_nacl_nonsfi.a', |
| 38 'build_glibc': 0, | 39 'build_glibc': 0, |
| 39 'build_newlib': 0, | 40 'build_newlib': 0, |
| 40 'build_irt': 0, | 41 'build_irt': 0, |
| 41 'build_pnacl_newlib': 0, | 42 'build_pnacl_newlib': 0, |
| 42 'build_nonsfi_helper': 1, | 43 'build_nonsfi_helper': 1, |
| 43 | 44 |
| 44 # Use linux IPC channel implementation for nacl_helper_nonsfi, | 45 # Use linux IPC channel implementation for nacl_helper_nonsfi, |
| 45 # instead of NaCl's IPC implementation (ipc_channel_nacl.cc), | 46 # instead of NaCl's IPC implementation (ipc_channel_nacl.cc), |
| 46 # because nacl_helper_nonsfi will be running directly on Linux. | 47 # because nacl_helper_nonsfi will be running directly on Linux. |
| 47 # ipc_channel_nacl.cc is excluded below. | 48 # ipc_channel_nacl.cc is excluded below. |
| 48 'sources': [ | 49 'sources': [ |
| 49 'ipc_channel.cc', | 50 'ipc_channel.cc', |
| 50 'ipc_channel_posix.cc', | 51 'ipc_channel_posix.cc', |
| 51 ], | 52 ], |
| 52 }, | 53 }, |
| 53 'sources!': [ | 54 'sources!': [ |
| 54 'ipc_channel_nacl.cc', | 55 'ipc_channel_nacl.cc', |
| 55 ], | 56 ], |
| 56 'dependencies': [ | 57 'dependencies': [ |
| 58 'ipc.gyp:ipc_interfaces', |
| 57 '../base/base_nacl.gyp:base_nacl_nonsfi', | 59 '../base/base_nacl.gyp:base_nacl_nonsfi', |
| 58 ], | 60 ], |
| 59 }, | 61 }, |
| 60 ], | 62 ], |
| 61 }], | 63 }], |
| 62 ], | 64 ], |
| 63 } | 65 } |
| OLD | NEW |