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

Side by Side Diff: components/nacl.gyp

Issue 117803002: Make building seccomp-bpf a GYP condition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 # Allow .cc files to know if they're being compiled as part 184 # Allow .cc files to know if they're being compiled as part
185 # of nacl_helper. 185 # of nacl_helper.
186 'IN_NACL_HELPER=1', 186 'IN_NACL_HELPER=1',
187 ], 187 ],
188 'sources': [ 188 'sources': [
189 'nacl/loader/nacl_sandbox_linux.cc', 189 'nacl/loader/nacl_sandbox_linux.cc',
190 'nacl/loader/nacl_helper_linux.cc', 190 'nacl/loader/nacl_helper_linux.cc',
191 'nacl/loader/nacl_helper_linux.h', 191 'nacl/loader/nacl_helper_linux.h',
192 '../base/posix/unix_domain_socket_linux.cc', 192 '../base/posix/unix_domain_socket_linux.cc',
193 '../content/common/child_process_sandbox_support_impl_shm_linux. cc', 193 '../content/common/child_process_sandbox_support_impl_shm_linux. cc',
194 '../content/common/sandbox_linux/sandbox_bpf_base_policy_linux.c c',
195 '../content/common/sandbox_linux/sandbox_init_linux.cc',
196 '../content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
197 '../content/public/common/content_switches.cc', 194 '../content/public/common/content_switches.cc',
198 ], 195 ],
199 'conditions': [ 196 'conditions': [
200 ['toolkit_uses_gtk == 1', { 197 ['toolkit_uses_gtk == 1', {
201 'dependencies': [ 198 'dependencies': [
202 '../build/linux/system.gyp:gtk', 199 '../build/linux/system.gyp:gtk',
203 ], 200 ],
204 }], 201 }],
205 ['use_glib == 1', { 202 ['use_glib == 1', {
206 'dependencies': [ 203 'dependencies': [
207 '../build/linux/system.gyp:glib', 204 '../build/linux/system.gyp:glib',
208 ], 205 ],
209 }], 206 }],
210 ['os_posix == 1 and OS != "mac"', { 207 ['os_posix == 1 and OS != "mac"', {
211 'conditions': [ 208 'conditions': [
212 ['linux_use_tcmalloc==1', { 209 ['linux_use_tcmalloc==1', {
213 'dependencies': [ 210 'dependencies': [
214 '../base/allocator/allocator.gyp:allocator', 211 '../base/allocator/allocator.gyp:allocator',
215 ], 212 ],
216 }], 213 }],
217 ], 214 ],
218 }], 215 }],
216 ['use_seccomp_bpf == 1', {
217 'sources': [
218 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc',
219 '../content/common/sandbox_linux/sandbox_init_linux.cc',
220 '../content/common/sandbox_linux/sandbox_seccomp_bpf_linux.c c',
221 ],
222 'defines': ['USE_SECCOMP_BPF'],
223 }, {
224 'sources': [
225 # Included in both cases
Mark Seaborn 2013/12/18 08:10:21 So why not leave it in the unconditional sources l
jln (very slow on Chromium) 2013/12/19 00:00:19 Yeah, I think I misunderstood how "defines" worked
226 '../content/common/sandbox_linux/sandbox_seccomp_bpf_linux.c c',
227 ],
228 }],
219 ], 229 ],
220 'cflags': ['-fPIE'], 230 'cflags': ['-fPIE'],
221 'link_settings': { 231 'link_settings': {
222 'ldflags': ['-pie'], 232 'ldflags': ['-pie'],
223 }, 233 },
224 }, 234 },
225 ], 235 ],
226 }], 236 }],
227 ['OS=="win" and target_arch=="ia32"', { 237 ['OS=="win" and target_arch=="ia32"', {
228 'targets': [ 238 'targets': [
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 'nacl/common/nacl_types.h', 372 'nacl/common/nacl_types.h',
363 'nacl/common/pnacl_types.cc', 373 'nacl/common/pnacl_types.cc',
364 'nacl/common/pnacl_types.h', 374 'nacl/common/pnacl_types.h',
365 ], 375 ],
366 'include_dirs': [ 376 'include_dirs': [
367 '..', 377 '..',
368 ], 378 ],
369 }, 379 },
370 ] 380 ]
371 } 381 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698