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

Side by Side Diff: chrome/nacl.gypi

Issue 7395024: For Linux, create a ZygoteForkDelegate that uses the nacl_helper executable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Presubmit: fixing a copyright header. Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/nacl_types.h ('k') | chrome/nacl/nacl_fork_delegate_linux.cc » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'nacl_target': 0, 8 'nacl_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 10 matching lines...) Expand all
21 ], 21 ],
22 'sources': [ 22 'sources': [
23 # .cc, .h, and .mm files under nacl that are used on all 23 # .cc, .h, and .mm files under nacl that are used on all
24 # platforms, including both 32-bit and 64-bit Windows. 24 # platforms, including both 32-bit and 64-bit Windows.
25 # Test files are also not included. 25 # Test files are also not included.
26 'nacl/nacl_main.cc', 26 'nacl/nacl_main.cc',
27 'nacl/nacl_main_platform_delegate.h', 27 'nacl/nacl_main_platform_delegate.h',
28 'nacl/nacl_main_platform_delegate_linux.cc', 28 'nacl/nacl_main_platform_delegate_linux.cc',
29 'nacl/nacl_main_platform_delegate_mac.mm', 29 'nacl/nacl_main_platform_delegate_mac.mm',
30 'nacl/nacl_main_platform_delegate_win.cc', 30 'nacl/nacl_main_platform_delegate_win.cc',
31 'nacl/nacl_launcher_thread.cc', 31 'nacl/nacl_listener.cc',
32 'nacl/nacl_launcher_thread.h', 32 'nacl/nacl_listener.h',
33 ], 33 ],
34 # TODO(gregoryd): consider switching NaCl to use Chrome OS defines 34 # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
35 'conditions': [ 35 'conditions': [
36 ['OS=="win"', { 36 ['OS=="win"', {
37 'defines': [ 37 'defines': [
38 '__STDC_LIMIT_MACROS=1', 38 '__STDC_LIMIT_MACROS=1',
39 ], 39 ],
40 'include_dirs': [ 40 'include_dirs': [
41 '<(DEPTH)/third_party/wtl/include', 41 '<(DEPTH)/third_party/wtl/include',
42 ], 42 ],
43 },], 43 },],
44 ['OS=="linux"', { 44 ['OS=="linux"', {
45 'defines': [ 45 'defines': [
46 '__STDC_LIMIT_MACROS=1', 46 '__STDC_LIMIT_MACROS=1',
47 ], 47 ],
48 'sources': [
49 'nacl/nacl_fork_delegate_linux.cc',
50 ],
48 },], 51 },],
49 ], 52 ],
50 }], 53 }],
51 ], 54 ],
52 }, 55 },
53 'targets': [ 56 'targets': [
54 { 57 {
55 'target_name': 'nacl', 58 'target_name': 'nacl',
56 'type': 'static_library', 59 'type': 'static_library',
57 'variables': { 60 'variables': {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 'direct_dependent_settings': { 137 'direct_dependent_settings': {
135 'defines': [ 138 'defines': [
136 'NACL_BLOCK_SHIFT=5', 139 'NACL_BLOCK_SHIFT=5',
137 'NACL_BLOCK_SIZE=32', 140 'NACL_BLOCK_SIZE=32',
138 '<@(nacl_defines)', 141 '<@(nacl_defines)',
139 ], 142 ],
140 }, 143 },
141 }, 144 },
142 ], 145 ],
143 }], 146 }],
147 ['OS=="linux"', {
148 'targets': [
149 {
150 'target_name': 'nacl_helper',
151 'type': 'executable',
152 'include_dirs': [
153 '..',
154 ],
155 'dependencies': [
156 'nacl',
157 ],
158 'sources': [
159 '../chrome/nacl/nacl_helper_linux.cc',
160 ],
161 },
162 ],
163 }],
144 ], 164 ],
145 } 165 }
OLDNEW
« no previous file with comments | « chrome/common/nacl_types.h ('k') | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698