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

Side by Side Diff: components/nacl.gyp

Issue 240613003: Revert of Add seccomp sandbox for non-SFI NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « components/components_tests.gyp ('k') | components/nacl/loader/nacl_helper_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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'nacl/nacl_defines.gypi', 10 'nacl/nacl_defines.gypi',
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 ], 174 ],
175 'conditions': [ 175 'conditions': [
176 ['OS=="linux"', { 176 ['OS=="linux"', {
177 'targets': [ 177 'targets': [
178 { 178 {
179 'target_name': 'nacl_helper', 179 'target_name': 'nacl_helper',
180 'type': 'executable', 180 'type': 'executable',
181 'include_dirs': [ 181 'include_dirs': [
182 '..', 182 '..',
183 ], 183 ],
184 'sources': [
185 'nacl/loader/nacl_helper_linux.cc',
186 'nacl/loader/nacl_helper_linux.h',
187 ],
188 'dependencies': [ 184 'dependencies': [
189 'nacl_loader', 185 'nacl',
190 ], 186 'nacl_common',
191 'cflags': ['-fPIE'], 187 'nacl_switches',
192 'link_settings': { 188 '../components/tracing.gyp:tracing',
193 'ldflags': ['-pie'], 189 '../crypto/crypto.gyp:crypto',
194 }, 190 '../sandbox/sandbox.gyp:libc_urandom_override',
195 }, { 191 '../sandbox/sandbox.gyp:sandbox',
196 'target_name': 'nacl_loader', 192 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
197 'type': 'static_library',
198 'include_dirs': [
199 '..',
200 ], 193 ],
201 'defines': [ 194 'defines': [
202 '<@(nacl_defines)', 195 '<@(nacl_defines)',
203 # Allow .cc files to know if they're being compiled as part 196 # Allow .cc files to know if they're being compiled as part
204 # of nacl_helper. 197 # of nacl_helper.
205 'IN_NACL_HELPER=1', 198 'IN_NACL_HELPER=1',
206 ], 199 ],
207 'sources': [ 200 'sources': [
201 'nacl/loader/nacl_helper_linux.cc',
202 'nacl/loader/nacl_helper_linux.h',
208 'nacl/loader/nacl_sandbox_linux.cc', 203 'nacl/loader/nacl_sandbox_linux.cc',
209 'nacl/loader/nonsfi/abi_conversion.cc', 204 'nacl/loader/nonsfi/abi_conversion.cc',
210 'nacl/loader/nonsfi/abi_conversion.h', 205 'nacl/loader/nonsfi/abi_conversion.h',
211 'nacl/loader/nonsfi/elf_loader.cc', 206 'nacl/loader/nonsfi/elf_loader.cc',
212 'nacl/loader/nonsfi/elf_loader.h', 207 'nacl/loader/nonsfi/elf_loader.h',
213 'nacl/loader/nonsfi/irt_basic.cc', 208 'nacl/loader/nonsfi/irt_basic.cc',
214 'nacl/loader/nonsfi/irt_clock.cc', 209 'nacl/loader/nonsfi/irt_clock.cc',
215 'nacl/loader/nonsfi/irt_fdio.cc', 210 'nacl/loader/nonsfi/irt_fdio.cc',
216 'nacl/loader/nonsfi/irt_futex.cc', 211 'nacl/loader/nonsfi/irt_futex.cc',
217 'nacl/loader/nonsfi/irt_interfaces.cc', 212 'nacl/loader/nonsfi/irt_interfaces.cc',
218 'nacl/loader/nonsfi/irt_interfaces.h', 213 'nacl/loader/nonsfi/irt_interfaces.h',
219 'nacl/loader/nonsfi/irt_memory.cc', 214 'nacl/loader/nonsfi/irt_memory.cc',
220 'nacl/loader/nonsfi/irt_ppapi.cc', 215 'nacl/loader/nonsfi/irt_ppapi.cc',
221 'nacl/loader/nonsfi/irt_random.cc', 216 'nacl/loader/nonsfi/irt_random.cc',
222 'nacl/loader/nonsfi/irt_thread.cc', 217 'nacl/loader/nonsfi/irt_thread.cc',
223 'nacl/loader/nonsfi/irt_util.h', 218 'nacl/loader/nonsfi/irt_util.h',
224 'nacl/loader/nonsfi/nonsfi_main.cc', 219 'nacl/loader/nonsfi/nonsfi_main.cc',
225 'nacl/loader/nonsfi/nonsfi_main.h', 220 'nacl/loader/nonsfi/nonsfi_main.h',
226 'nacl/loader/nonsfi/nonsfi_sandbox.cc',
227 'nacl/loader/nonsfi/nonsfi_sandbox.h',
228 '../ppapi/nacl_irt/plugin_main.cc', 221 '../ppapi/nacl_irt/plugin_main.cc',
229 '../ppapi/nacl_irt/plugin_main.h', 222 '../ppapi/nacl_irt/plugin_main.h',
230 '../ppapi/nacl_irt/plugin_startup.cc', 223 '../ppapi/nacl_irt/plugin_startup.cc',
231 '../ppapi/nacl_irt/plugin_startup.h', 224 '../ppapi/nacl_irt/plugin_startup.h',
232 '../ppapi/nacl_irt/ppapi_dispatcher.cc', 225 '../ppapi/nacl_irt/ppapi_dispatcher.cc',
233 '../ppapi/nacl_irt/ppapi_dispatcher.h', 226 '../ppapi/nacl_irt/ppapi_dispatcher.h',
234 ], 227 ],
235 'dependencies': [
236 'nacl',
237 'nacl_common',
238 'nacl_switches',
239 '../components/tracing.gyp:tracing',
240 '../crypto/crypto.gyp:crypto',
241 '../sandbox/sandbox.gyp:libc_urandom_override',
242 '../sandbox/sandbox.gyp:sandbox',
243 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
244 ],
245 'conditions': [ 228 'conditions': [
246 ['toolkit_uses_gtk == 1', { 229 ['toolkit_uses_gtk == 1', {
247 'dependencies': [ 230 'dependencies': [
248 '../build/linux/system.gyp:gtk', 231 '../build/linux/system.gyp:gtk',
249 ], 232 ],
250 }], 233 }],
251 ['use_glib == 1', { 234 ['use_glib == 1', {
252 'dependencies': [ 235 'dependencies': [
253 '../build/linux/system.gyp:glib', 236 '../build/linux/system.gyp:glib',
254 ], 237 ],
(...skipping 11 matching lines...) Expand all
266 ['use_seccomp_bpf == 0', { 249 ['use_seccomp_bpf == 0', {
267 'sources!': [ 250 'sources!': [
268 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc', 251 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc',
269 '../content/common/sandbox_linux/sandbox_init_linux.cc', 252 '../content/common/sandbox_linux/sandbox_init_linux.cc',
270 ], 253 ],
271 }, { 254 }, {
272 'defines': ['USE_SECCOMP_BPF'], 255 'defines': ['USE_SECCOMP_BPF'],
273 }], 256 }],
274 ], 257 ],
275 'cflags': ['-fPIE'], 258 'cflags': ['-fPIE'],
259 'link_settings': {
260 'ldflags': ['-pie'],
261 },
276 }, 262 },
277 ], 263 ],
278 }], 264 }],
279 ['OS=="win" and target_arch=="ia32"', { 265 ['OS=="win" and target_arch=="ia32"', {
280 'targets': [ 266 'targets': [
281 { 267 {
282 'target_name': 'nacl_win64', 268 'target_name': 'nacl_win64',
283 'type': 'static_library', 269 'type': 'static_library',
284 'variables': { 270 'variables': {
285 'nacl_target': 1, 271 'nacl_target': 1,
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 ], 403 ],
418 'include_dirs': [ 404 'include_dirs': [
419 '..', 405 '..',
420 ], 406 ],
421 'dependencies': [ 407 'dependencies': [
422 '../content/content.gyp:content_common', 408 '../content/content.gyp:content_common',
423 ], 409 ],
424 }, 410 },
425 ] 411 ]
426 } 412 }
OLDNEW
« no previous file with comments | « components/components_tests.gyp ('k') | components/nacl/loader/nacl_helper_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698