| 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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 'sources': [ | 238 'sources': [ |
| 239 'nacl/loader/nacl_helper_linux.cc', | 239 'nacl/loader/nacl_helper_linux.cc', |
| 240 'nacl/loader/nacl_helper_linux.h', | 240 'nacl/loader/nacl_helper_linux.h', |
| 241 ], | 241 ], |
| 242 'dependencies': [ | 242 'dependencies': [ |
| 243 'nacl_linux', | 243 'nacl_linux', |
| 244 ], | 244 ], |
| 245 'cflags': ['-fPIE'], | 245 'cflags': ['-fPIE'], |
| 246 'ldflags!': [ | 246 'ldflags!': [ |
| 247 # Do not pick the default ASan options from | 247 # Do not pick the default ASan options from |
| 248 # base/debug/sanitizer_options.cc to avoid a conflict with those | 248 # build/sanitizers/sanitizer_options.cc to avoid a conflict with |
| 249 # in nacl/nacl_helper_linux.cc. | 249 # those in nacl/nacl_helper_linux.cc. |
| 250 '-Wl,-u_sanitizer_options_link_helper', | 250 '-Wl,-u_sanitizer_options_link_helper', |
| 251 ], | 251 ], |
| 252 'link_settings': { | 252 'link_settings': { |
| 253 'ldflags': ['-pie'], | 253 'ldflags': ['-pie'], |
| 254 }, | 254 }, |
| 255 }, { | 255 }, { |
| 256 'target_name': 'nacl_linux', | 256 'target_name': 'nacl_linux', |
| 257 'type': 'static_library', | 257 'type': 'static_library', |
| 258 'include_dirs': [ | 258 'include_dirs': [ |
| 259 '..', | 259 '..', |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 ], | 504 ], |
| 505 'include_dirs': [ | 505 'include_dirs': [ |
| 506 '..', | 506 '..', |
| 507 ], | 507 ], |
| 508 'dependencies': [ | 508 'dependencies': [ |
| 509 '../content/content.gyp:content_common', | 509 '../content/content.gyp:content_common', |
| 510 ], | 510 ], |
| 511 }, | 511 }, |
| 512 ] | 512 ] |
| 513 } | 513 } |
| OLD | NEW |