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

Side by Side Diff: ipc/ipc_nacl.gyp

Issue 2069803003: Fold //ipc/mojo into //ipc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-ipc-deps
Patch Set: rebase Created 4 years, 6 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_mojo_perftest.cc ('k') | ipc/mojo/BUILD.gn » ('j') | 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 'ipc.gyp:ipc_interfaces',
28 '../base/base_nacl.gyp:base_nacl', 29 '../base/base_nacl.gyp:base_nacl',
29 '../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl', 30 '../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl',
30 '../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl', 31 '../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl',
31 ], 32 ],
32 }, 33 },
33 { 34 {
34 'target_name': 'ipc_nacl_nonsfi', 35 'target_name': 'ipc_nacl_nonsfi',
35 'type': 'none', 36 'type': 'none',
36 'variables': { 37 'variables': {
37 'ipc_target': 1, 38 'ipc_target': 1,
(...skipping 11 matching lines...) Expand all
49 # ipc_channel_nacl.cc is excluded below. 50 # ipc_channel_nacl.cc is excluded below.
50 'sources': [ 51 'sources': [
51 'ipc_channel.cc', 52 'ipc_channel.cc',
52 'ipc_channel_posix.cc', 53 'ipc_channel_posix.cc',
53 ], 54 ],
54 }, 55 },
55 'sources!': [ 56 'sources!': [
56 'ipc_channel_nacl.cc', 57 'ipc_channel_nacl.cc',
57 ], 58 ],
58 'dependencies': [ 59 'dependencies': [
60 'ipc.gyp:ipc_interfaces',
59 '../base/base_nacl.gyp:base_nacl_nonsfi', 61 '../base/base_nacl.gyp:base_nacl_nonsfi',
60 '../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl', 62 '../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl',
61 '../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl', 63 '../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl',
62 ], 64 ],
63 }, 65 },
64 ], 66 ],
65 }], 67 }],
66 ], 68 ],
67 } 69 }
OLDNEW
« no previous file with comments | « ipc/ipc_mojo_perftest.cc ('k') | ipc/mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698