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

Side by Side Diff: components/nacl.gyp

Issue 196793023: Add seccomp sandbox for non-SFI NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove one more unittest for shutdown 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
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 ],
184 'dependencies': [ 188 'dependencies': [
185 'nacl', 189 'nacl_loader',
186 'nacl_common', 190 ],
187 'nacl_switches', 191 'cflags': ['-fPIE'],
188 '../components/tracing.gyp:tracing', 192 'link_settings': {
189 '../crypto/crypto.gyp:crypto', 193 'ldflags': ['-pie'],
190 '../sandbox/sandbox.gyp:libc_urandom_override', 194 },
191 '../sandbox/sandbox.gyp:sandbox', 195 }, {
192 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 196 'target_name': 'nacl_loader',
197 'type': 'static_library',
198 'include_dirs': [
199 '..',
193 ], 200 ],
194 'defines': [ 201 'defines': [
195 '<@(nacl_defines)', 202 '<@(nacl_defines)',
196 # Allow .cc files to know if they're being compiled as part 203 # Allow .cc files to know if they're being compiled as part
197 # of nacl_helper. 204 # of nacl_helper.
198 'IN_NACL_HELPER=1', 205 'IN_NACL_HELPER=1',
199 ], 206 ],
200 'sources': [ 207 'sources': [
201 'nacl/loader/nacl_helper_linux.cc',
202 'nacl/loader/nacl_helper_linux.h',
203 'nacl/loader/nacl_sandbox_linux.cc', 208 'nacl/loader/nacl_sandbox_linux.cc',
204 'nacl/loader/nonsfi/abi_conversion.cc', 209 'nacl/loader/nonsfi/abi_conversion.cc',
205 'nacl/loader/nonsfi/abi_conversion.h', 210 'nacl/loader/nonsfi/abi_conversion.h',
206 'nacl/loader/nonsfi/elf_loader.cc', 211 'nacl/loader/nonsfi/elf_loader.cc',
207 'nacl/loader/nonsfi/elf_loader.h', 212 'nacl/loader/nonsfi/elf_loader.h',
208 'nacl/loader/nonsfi/irt_basic.cc', 213 'nacl/loader/nonsfi/irt_basic.cc',
209 'nacl/loader/nonsfi/irt_clock.cc', 214 'nacl/loader/nonsfi/irt_clock.cc',
210 'nacl/loader/nonsfi/irt_fdio.cc', 215 'nacl/loader/nonsfi/irt_fdio.cc',
211 'nacl/loader/nonsfi/irt_futex.cc', 216 'nacl/loader/nonsfi/irt_futex.cc',
212 'nacl/loader/nonsfi/irt_interfaces.cc', 217 'nacl/loader/nonsfi/irt_interfaces.cc',
213 'nacl/loader/nonsfi/irt_interfaces.h', 218 'nacl/loader/nonsfi/irt_interfaces.h',
214 'nacl/loader/nonsfi/irt_memory.cc', 219 'nacl/loader/nonsfi/irt_memory.cc',
215 'nacl/loader/nonsfi/irt_ppapi.cc', 220 'nacl/loader/nonsfi/irt_ppapi.cc',
216 'nacl/loader/nonsfi/irt_random.cc', 221 'nacl/loader/nonsfi/irt_random.cc',
217 'nacl/loader/nonsfi/irt_thread.cc', 222 'nacl/loader/nonsfi/irt_thread.cc',
218 'nacl/loader/nonsfi/irt_util.h', 223 'nacl/loader/nonsfi/irt_util.h',
219 'nacl/loader/nonsfi/nonsfi_main.cc', 224 'nacl/loader/nonsfi/nonsfi_main.cc',
220 'nacl/loader/nonsfi/nonsfi_main.h', 225 'nacl/loader/nonsfi/nonsfi_main.h',
226 'nacl/loader/nonsfi/nonsfi_sandbox.cc',
227 'nacl/loader/nonsfi/nonsfi_sandbox.h',
221 '../ppapi/nacl_irt/plugin_main.cc', 228 '../ppapi/nacl_irt/plugin_main.cc',
222 '../ppapi/nacl_irt/plugin_main.h', 229 '../ppapi/nacl_irt/plugin_main.h',
223 '../ppapi/nacl_irt/plugin_startup.cc', 230 '../ppapi/nacl_irt/plugin_startup.cc',
224 '../ppapi/nacl_irt/plugin_startup.h', 231 '../ppapi/nacl_irt/plugin_startup.h',
225 '../ppapi/nacl_irt/ppapi_dispatcher.cc', 232 '../ppapi/nacl_irt/ppapi_dispatcher.cc',
226 '../ppapi/nacl_irt/ppapi_dispatcher.h', 233 '../ppapi/nacl_irt/ppapi_dispatcher.h',
227 ], 234 ],
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 ],
228 'conditions': [ 245 'conditions': [
229 ['toolkit_uses_gtk == 1', { 246 ['toolkit_uses_gtk == 1', {
230 'dependencies': [ 247 'dependencies': [
231 '../build/linux/system.gyp:gtk', 248 '../build/linux/system.gyp:gtk',
232 ], 249 ],
233 }], 250 }],
234 ['use_glib == 1', { 251 ['use_glib == 1', {
235 'dependencies': [ 252 'dependencies': [
236 '../build/linux/system.gyp:glib', 253 '../build/linux/system.gyp:glib',
237 ], 254 ],
(...skipping 12 matching lines...) Expand all
250 'sources!': [ 267 'sources!': [
251 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc', 268 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc',
252 '../content/common/sandbox_linux/sandbox_init_linux.cc', 269 '../content/common/sandbox_linux/sandbox_init_linux.cc',
253 ], 270 ],
254 }, { 271 }, {
255 'defines': ['USE_SECCOMP_BPF'], 272 'defines': ['USE_SECCOMP_BPF'],
256 }], 273 }],
257 ], 274 ],
258 'cflags': ['-fPIE'], 275 'cflags': ['-fPIE'],
259 'link_settings': { 276 'link_settings': {
260 'ldflags': ['-pie'], 277 'ldflags': ['-pie'],
Mark Seaborn 2014/04/15 23:03:14 This doesn't make sense for a library, so you can
hamaji 2014/04/16 02:10:48 Oops, done.
261 }, 278 },
262 }, 279 },
263 ], 280 ],
264 }], 281 }],
265 ['OS=="win" and target_arch=="ia32"', { 282 ['OS=="win" and target_arch=="ia32"', {
266 'targets': [ 283 'targets': [
267 { 284 {
268 'target_name': 'nacl_win64', 285 'target_name': 'nacl_win64',
269 'type': 'static_library', 286 'type': 'static_library',
270 'variables': { 287 'variables': {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 ], 420 ],
404 'include_dirs': [ 421 'include_dirs': [
405 '..', 422 '..',
406 ], 423 ],
407 'dependencies': [ 424 'dependencies': [
408 '../content/content.gyp:content_common', 425 '../content/content.gyp:content_common',
409 ], 426 ],
410 }, 427 },
411 ] 428 ]
412 } 429 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698