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

Side by Side Diff: ipc/ipc_nacl.gyp

Issue 1321253011: Remove dependency on //crypto in //ipc, except on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fallback_clean
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « ipc/ipc_channel_reader_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 '../base/base_nacl.gyp:base_nacl', 28 '../base/base_nacl.gyp:base_nacl',
29 '../crypto/crypto_nacl.gyp:crypto_nacl',
30 ], 29 ],
31 }, 30 },
32 { 31 {
33 'target_name': 'ipc_nacl_nonsfi', 32 'target_name': 'ipc_nacl_nonsfi',
34 'type': 'none', 33 'type': 'none',
35 'variables': { 34 'variables': {
36 'ipc_target': 1, 35 'ipc_target': 1,
37 'nacl_untrusted_build': 1, 36 'nacl_untrusted_build': 1,
38 'nlib_target': 'libipc_nacl_nonsfi.a', 37 'nlib_target': 'libipc_nacl_nonsfi.a',
39 'build_glibc': 0, 38 'build_glibc': 0,
40 'build_newlib': 0, 39 'build_newlib': 0,
41 'build_irt': 0, 40 'build_irt': 0,
42 'build_pnacl_newlib': 0, 41 'build_pnacl_newlib': 0,
43 'build_nonsfi_helper': 1, 42 'build_nonsfi_helper': 1,
44 43
45 # Use linux IPC channel implementation for nacl_helper_nonsfi, 44 # Use linux IPC channel implementation for nacl_helper_nonsfi,
46 # instead of NaCl's IPC implementation (ipc_channel_nacl.cc), 45 # instead of NaCl's IPC implementation (ipc_channel_nacl.cc),
47 # because nacl_helper_nonsfi will be running directly on Linux. 46 # because nacl_helper_nonsfi will be running directly on Linux.
48 # ipc_channel_nacl.cc is excluded below. 47 # ipc_channel_nacl.cc is excluded below.
49 'sources': [ 48 'sources': [
50 'ipc_channel.cc', 49 'ipc_channel.cc',
51 'ipc_channel_posix.cc', 50 'ipc_channel_posix.cc',
52 ], 51 ],
53 }, 52 },
54 'sources!': [ 53 'sources!': [
55 'ipc_channel_nacl.cc', 54 'ipc_channel_nacl.cc',
56 ], 55 ],
57 'dependencies': [ 56 'dependencies': [
58 '../base/base_nacl.gyp:base_nacl_nonsfi', 57 '../base/base_nacl.gyp:base_nacl_nonsfi',
59 '../crypto/crypto_nacl.gyp:crypto_nacl',
60 ], 58 ],
61 }, 59 },
62 ], 60 ],
63 }], 61 }],
64 ], 62 ],
65 } 63 }
OLDNEW
« no previous file with comments | « ipc/ipc_channel_reader_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698