| OLD | NEW |
| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 '..', | 190 '..', |
| 191 ], | 191 ], |
| 192 'sources': [ | 192 'sources': [ |
| 193 'nacl/loader/nacl_helper_linux.cc', | 193 'nacl/loader/nacl_helper_linux.cc', |
| 194 'nacl/loader/nacl_helper_linux.h', | 194 'nacl/loader/nacl_helper_linux.h', |
| 195 ], | 195 ], |
| 196 'dependencies': [ | 196 'dependencies': [ |
| 197 'nacl_loader', | 197 'nacl_loader', |
| 198 ], | 198 ], |
| 199 'cflags': ['-fPIE'], | 199 'cflags': ['-fPIE'], |
| 200 'ldflags!': [ |
| 201 # Do not pick the default ASan options from |
| 202 # base/debug/sanitizer_options.cc to avoid a conflict with those |
| 203 # in nacl/nacl_helper_linux.cc. |
| 204 '-Wl,-u_sanitizer_options_link_helper', |
| 205 ], |
| 200 'link_settings': { | 206 'link_settings': { |
| 201 'ldflags': ['-pie'], | 207 'ldflags': ['-pie'], |
| 202 }, | 208 }, |
| 203 }, { | 209 }, { |
| 204 'target_name': 'nacl_loader', | 210 'target_name': 'nacl_loader', |
| 205 'type': 'static_library', | 211 'type': 'static_library', |
| 206 'include_dirs': [ | 212 'include_dirs': [ |
| 207 '..', | 213 '..', |
| 208 ], | 214 ], |
| 209 'ldflags!': [ | |
| 210 # Do not pick the default ASan options from | |
| 211 # base/debug/sanitizer_options.cc to avoid a conflict with those | |
| 212 # in nacl/nacl_helper_linux.cc. | |
| 213 '-Wl,-u_sanitizer_options_link_helper', | |
| 214 ], | |
| 215 'defines': [ | 215 'defines': [ |
| 216 '<@(nacl_defines)', | 216 '<@(nacl_defines)', |
| 217 # Allow .cc files to know if they're being compiled as part | 217 # Allow .cc files to know if they're being compiled as part |
| 218 # of nacl_helper. | 218 # of nacl_helper. |
| 219 'IN_NACL_HELPER=1', | 219 'IN_NACL_HELPER=1', |
| 220 ], | 220 ], |
| 221 'sources': [ | 221 'sources': [ |
| 222 'nacl/loader/nacl_sandbox_linux.cc', | 222 'nacl/loader/nacl_sandbox_linux.cc', |
| 223 'nacl/loader/nonsfi/abi_conversion.cc', | 223 'nacl/loader/nonsfi/abi_conversion.cc', |
| 224 'nacl/loader/nonsfi/abi_conversion.h', | 224 'nacl/loader/nonsfi/abi_conversion.h', |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 ], | 431 ], |
| 432 'include_dirs': [ | 432 'include_dirs': [ |
| 433 '..', | 433 '..', |
| 434 ], | 434 ], |
| 435 'dependencies': [ | 435 'dependencies': [ |
| 436 '../content/content.gyp:content_common', | 436 '../content/content.gyp:content_common', |
| 437 ], | 437 ], |
| 438 }, | 438 }, |
| 439 ] | 439 ] |
| 440 } | 440 } |
| OLD | NEW |