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