Index: components/nacl.gyp |
diff --git a/components/nacl.gyp b/components/nacl.gyp |
index 7dd13bac7ce6b62441a5a07e55473954964f3d57..bd567005c0fa3098021e1140dc621827295ba6dd 100644 |
--- a/components/nacl.gyp |
+++ b/components/nacl.gyp |
@@ -181,22 +181,15 @@ |
'include_dirs': [ |
'..', |
], |
- 'sources': [ |
- 'nacl/loader/nacl_helper_linux.cc', |
- 'nacl/loader/nacl_helper_linux.h', |
- ], |
'dependencies': [ |
- 'nacl_loader', |
- ], |
- 'cflags': ['-fPIE'], |
- 'link_settings': { |
- 'ldflags': ['-pie'], |
- }, |
- }, { |
- 'target_name': 'nacl_loader', |
- 'type': 'static_library', |
- 'include_dirs': [ |
- '..', |
+ 'nacl', |
+ 'nacl_common', |
+ 'nacl_switches', |
+ '../components/tracing.gyp:tracing', |
+ '../crypto/crypto.gyp:crypto', |
+ '../sandbox/sandbox.gyp:libc_urandom_override', |
+ '../sandbox/sandbox.gyp:sandbox', |
+ '../ppapi/ppapi_internal.gyp:ppapi_proxy', |
], |
'defines': [ |
'<@(nacl_defines)', |
@@ -205,6 +198,8 @@ |
'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', |
@@ -223,24 +218,12 @@ |
'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', |
'../ppapi/nacl_irt/plugin_startup.h', |
'../ppapi/nacl_irt/ppapi_dispatcher.cc', |
'../ppapi/nacl_irt/ppapi_dispatcher.h', |
- ], |
- 'dependencies': [ |
- 'nacl', |
- 'nacl_common', |
- 'nacl_switches', |
- '../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', { |
@@ -273,6 +256,9 @@ |
}], |
], |
'cflags': ['-fPIE'], |
+ 'link_settings': { |
+ 'ldflags': ['-pie'], |
+ }, |
}, |
], |
}], |