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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 028b8c629b4d30b6463aa134ca6351e1b24c2c4e..cf82bc166a30735ded63cce78f2cc7aba44e74a3 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -181,14 +181,22 @@
'include_dirs': [
'..',
],
+ 'sources': [
+ 'nacl/loader/nacl_helper_linux.cc',
+ 'nacl/loader/nacl_helper_linux.h',
+ ],
'dependencies': [
- 'nacl',
- 'nacl_common',
- '../components/tracing.gyp:tracing',
- '../crypto/crypto.gyp:crypto',
- '../sandbox/sandbox.gyp:libc_urandom_override',
- '../sandbox/sandbox.gyp:sandbox',
- '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+ 'nacl_loader',
+ ],
+ 'cflags': ['-fPIE'],
+ 'link_settings': {
+ 'ldflags': ['-pie'],
+ },
+ }, {
+ 'target_name': 'nacl_loader',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..',
],
'defines': [
'<@(nacl_defines)',
@@ -197,8 +205,6 @@
'IN_NACL_HELPER=1',
],
'sources': [
- 'nacl/loader/nacl_helper_linux.cc',
- 'nacl/loader/nacl_helper_linux.h',
'nacl/loader/nacl_sandbox_linux.cc',
'nacl/loader/nonsfi/abi_conversion.cc',
'nacl/loader/nonsfi/abi_conversion.h',
@@ -217,6 +223,8 @@
'nacl/loader/nonsfi/irt_util.h',
'nacl/loader/nonsfi/nonsfi_main.cc',
'nacl/loader/nonsfi/nonsfi_main.h',
+ 'nacl/loader/nonsfi/nonsfi_sandbox.cc',
+ 'nacl/loader/nonsfi/nonsfi_sandbox.h',
'../ppapi/nacl_irt/plugin_main.cc',
'../ppapi/nacl_irt/plugin_main.h',
'../ppapi/nacl_irt/plugin_startup.cc',
@@ -224,6 +232,15 @@
'../ppapi/nacl_irt/ppapi_dispatcher.cc',
'../ppapi/nacl_irt/ppapi_dispatcher.h',
],
+ 'dependencies': [
+ 'nacl',
+ 'nacl_common',
+ '../components/tracing.gyp:tracing',
+ '../crypto/crypto.gyp:crypto',
+ '../sandbox/sandbox.gyp:libc_urandom_override',
+ '../sandbox/sandbox.gyp:sandbox',
+ '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+ ],
'conditions': [
['toolkit_uses_gtk == 1', {
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698