| 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   'target_defaults': { | 9   'target_defaults': { | 
| 10     'variables': { | 10     'variables': { | 
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 220               'type': 'executable', | 220               'type': 'executable', | 
| 221               'include_dirs': [ | 221               'include_dirs': [ | 
| 222                 '..', | 222                 '..', | 
| 223               ], | 223               ], | 
| 224               'sources': [ | 224               'sources': [ | 
| 225                 'nacl/loader/nacl_helper_linux.cc', | 225                 'nacl/loader/nacl_helper_linux.cc', | 
| 226                 'nacl/loader/nacl_helper_linux.h', | 226                 'nacl/loader/nacl_helper_linux.h', | 
| 227               ], | 227               ], | 
| 228               'dependencies': [ | 228               'dependencies': [ | 
| 229                 'nacl_linux', | 229                 'nacl_linux', | 
|  | 230                 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', | 
| 230               ], | 231               ], | 
| 231               'cflags': ['-fPIE'], | 232               'cflags': ['-fPIE'], | 
| 232               'ldflags!': [ | 233               'ldflags!': [ | 
| 233                 # Do not pick the default ASan options from | 234                 # Do not pick the default ASan options from | 
| 234                 # build/sanitizers/sanitizer_options.cc to avoid a conflict with | 235                 # build/sanitizers/sanitizer_options.cc to avoid a conflict with | 
| 235                 # those in nacl/nacl_helper_linux.cc. | 236                 # those in nacl/nacl_helper_linux.cc. | 
| 236                 '-Wl,-u_sanitizer_options_link_helper', | 237                 '-Wl,-u_sanitizer_options_link_helper', | 
| 237               ], | 238               ], | 
| 238               'link_settings': { | 239               'link_settings': { | 
| 239                 'ldflags': ['-pie'], | 240                 'ldflags': ['-pie'], | 
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 493       ], | 494       ], | 
| 494       'include_dirs': [ | 495       'include_dirs': [ | 
| 495         '..', | 496         '..', | 
| 496       ], | 497       ], | 
| 497       'dependencies': [ | 498       'dependencies': [ | 
| 498         '../content/content.gyp:content_common', | 499         '../content/content.gyp:content_common', | 
| 499       ], | 500       ], | 
| 500     }, | 501     }, | 
| 501   ] | 502   ] | 
| 502 } | 503 } | 
| OLD | NEW | 
|---|