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

Side by Side Diff: chrome/nacl.gypi

Issue 20337002: Move NaCl loader related files to components/nacl/loader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add TODO and remove sandbox entry Created 7 years, 4 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 | « chrome/chrome_tests_unit.gypi ('k') | chrome/nacl/DEPS » ('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) 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 'include': [ 6 'include': [
7 '../native_client/build/untrusted.gypi', 7 '../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
11 'nacl_target': 0, 11 'nacl_target': 0,
12 }, 12 },
13 'target_conditions': [ 13 'target_conditions': [
14 # This part is shared between the targets defined below. Only files and 14 # This part is shared between the targets defined below. Only files and
15 # settings relevant for building the Win64 target should be added here. 15 # settings relevant for building the Win64 target should be added here.
16 ['nacl_target==1', { 16 ['nacl_target==1', {
17 'include_dirs': [ 17 'include_dirs': [
18 '<(INTERMEDIATE_DIR)', 18 '<(INTERMEDIATE_DIR)',
19 ], 19 ],
20 'defines': [ 20 'defines': [
21 '<@(nacl_defines)', 21 '<@(nacl_defines)',
22 ], 22 ],
23 'sources': [ 23 'sources': [
24 # .cc, .h, and .mm files under nacl that are used on all 24 # .cc, .h, and .mm files under nacl that are used on all
25 # platforms, including both 32-bit and 64-bit Windows. 25 # platforms, including both 32-bit and 64-bit Windows.
26 # Test files are also not included. 26 # Test files are also not included.
27 'nacl/nacl_ipc_adapter.cc', 27 '../components/nacl/loader/nacl_ipc_adapter.cc',
28 'nacl/nacl_ipc_adapter.h', 28 '../components/nacl/loader/nacl_ipc_adapter.h',
29 'nacl/nacl_main.cc', 29 '../components/nacl/loader/nacl_main.cc',
30 'nacl/nacl_main_platform_delegate.h', 30 '../components/nacl/loader/nacl_main_platform_delegate.h',
31 'nacl/nacl_main_platform_delegate_linux.cc', 31 '../components/nacl/loader/nacl_main_platform_delegate_linux.cc',
32 'nacl/nacl_main_platform_delegate_mac.mm', 32 '../components/nacl/loader/nacl_main_platform_delegate_mac.mm',
33 'nacl/nacl_main_platform_delegate_win.cc', 33 '../components/nacl/loader/nacl_main_platform_delegate_win.cc',
34 'nacl/nacl_listener.cc', 34 '../components/nacl/loader/nacl_listener.cc',
35 'nacl/nacl_listener.h', 35 '../components/nacl/loader/nacl_listener.h',
36 'nacl/nacl_validation_db.h', 36 '../components/nacl/loader/nacl_validation_db.h',
37 'nacl/nacl_validation_query.cc', 37 '../components/nacl/loader/nacl_validation_query.cc',
38 'nacl/nacl_validation_query.h', 38 '../components/nacl/loader/nacl_validation_query.h',
39 ], 39 ],
40 # TODO(gregoryd): consider switching NaCl to use Chrome OS defines 40 # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
41 'conditions': [ 41 'conditions': [
42 ['OS=="win"', { 42 ['OS=="win"', {
43 'defines': [ 43 'defines': [
44 '__STDC_LIMIT_MACROS=1', 44 '__STDC_LIMIT_MACROS=1',
45 ], 45 ],
46 'include_dirs': [ 46 'include_dirs': [
47 '<(DEPTH)/third_party/wtl/include', 47 '<(DEPTH)/third_party/wtl/include',
48 ], 48 ],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 ], 148 ],
149 'dependencies': [ 149 'dependencies': [
150 '../components/nacl_common.gyp:nacl_common', 150 '../components/nacl_common.gyp:nacl_common',
151 '../crypto/crypto.gyp:crypto', 151 '../crypto/crypto.gyp:crypto',
152 '../sandbox/sandbox.gyp:libc_urandom_override', 152 '../sandbox/sandbox.gyp:libc_urandom_override',
153 '../sandbox/sandbox.gyp:sandbox', 153 '../sandbox/sandbox.gyp:sandbox',
154 'nacl', 154 'nacl',
155 ], 155 ],
156 'sources': [ 156 'sources': [
157 'nacl/nacl_helper_linux.cc', 157 'nacl/nacl_helper_linux.cc',
158 'nacl/nacl_sandbox_linux.cc',
159 '../base/posix/unix_domain_socket_linux.cc', 158 '../base/posix/unix_domain_socket_linux.cc',
159 '../components/nacl/loader/nacl_sandbox_linux.cc',
160 '../content/common/child_process_sandbox_support_impl_shm_linux. cc', 160 '../content/common/child_process_sandbox_support_impl_shm_linux. cc',
161 '../content/common/sandbox_init_linux.cc', 161 '../content/common/sandbox_init_linux.cc',
162 '../content/common/sandbox_seccomp_bpf_linux.cc', 162 '../content/common/sandbox_seccomp_bpf_linux.cc',
163 '../content/public/common/content_switches.cc', 163 '../content/public/common/content_switches.cc',
164 ], 164 ],
165 'conditions': [ 165 'conditions': [
166 ['toolkit_uses_gtk == 1', { 166 ['toolkit_uses_gtk == 1', {
167 'dependencies': [ 167 'dependencies': [
168 '../build/linux/system.gyp:gtk', 168 '../build/linux/system.gyp:gtk',
169 ], 169 ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 'target_name': 'nacl_win64', 206 'target_name': 'nacl_win64',
207 'type': 'none', 207 'type': 'none',
208 'sources': [], 208 'sources': [],
209 }, 209 },
210 ], 210 ],
211 }], 211 }],
212 ], 212 ],
213 }], 213 }],
214 ], 214 ],
215 } 215 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/nacl/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698