| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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   'conditions': [ | 6   'conditions': [ | 
| 7     ['disable_nacl!=1', { | 7     ['disable_nacl!=1', { | 
| 8       'conditions': [ | 8       'conditions': [ | 
| 9         ['OS=="linux"', { | 9         ['OS=="linux"', { | 
| 10           'includes': [ | 10           'includes': [ | 
| 11             '../components/nacl/nacl_defines.gypi', | 11             '../components/nacl/nacl_defines.gypi', | 
| 12           ], | 12           ], | 
| 13           'targets': [ | 13           'targets': [ | 
| 14             { | 14             { | 
| 15               'target_name': 'nacl_helper', | 15               'target_name': 'nacl_helper', | 
| 16               'type': 'executable', | 16               'type': 'executable', | 
| 17               'include_dirs': [ | 17               'include_dirs': [ | 
| 18                 '..', | 18                 '..', | 
| 19               ], | 19               ], | 
| 20               'dependencies': [ | 20               'dependencies': [ | 
| 21                 '../components/nacl.gyp:nacl', | 21                 '../components/nacl.gyp:nacl', | 
| 22                 '../components/nacl_common.gyp:nacl_common', | 22                 '../components/nacl_common.gyp:nacl_common', | 
| 23                 '../crypto/crypto.gyp:crypto', | 23                 '../crypto/crypto.gyp:crypto', | 
| 24                 '../sandbox/sandbox.gyp:libc_urandom_override', | 24                 '../sandbox/sandbox.gyp:libc_urandom_override', | 
| 25                 '../sandbox/sandbox.gyp:sandbox', | 25                 '../sandbox/sandbox.gyp:sandbox', | 
| 26               ], | 26               ], | 
|  | 27               'ldflags!': [ | 
|  | 28                 # Do not pick the default ASan options from | 
|  | 29                 # base/debug/sanitizer_options.cc to avoid th conflict with | 
|  | 30                 # those in nacl/nacl_helper_linux.cc. | 
|  | 31                 '-Wl,-u_sanitizer_options_link_helper', | 
|  | 32               ], | 
| 27               'defines': [ | 33               'defines': [ | 
| 28                 '<@(nacl_defines)', | 34                 '<@(nacl_defines)', | 
| 29               ], | 35               ], | 
| 30               'sources': [ | 36               'sources': [ | 
| 31                 'nacl/nacl_helper_linux.cc', | 37                 'nacl/nacl_helper_linux.cc', | 
| 32                 '../base/posix/unix_domain_socket_linux.cc', | 38                 '../base/posix/unix_domain_socket_linux.cc', | 
| 33                 '../components/nacl/loader/nacl_sandbox_linux.cc', | 39                 '../components/nacl/loader/nacl_sandbox_linux.cc', | 
| 34                 '../content/common/child_process_sandbox_support_impl_shm_linux.
    cc', | 40                 '../content/common/child_process_sandbox_support_impl_shm_linux.
    cc', | 
| 35                 '../content/common/sandbox_init_linux.cc', | 41                 '../content/common/sandbox_init_linux.cc', | 
| 36                 '../content/common/sandbox_seccomp_bpf_linux.cc', | 42                 '../content/common/sandbox_seccomp_bpf_linux.cc', | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 61               'link_settings': { | 67               'link_settings': { | 
| 62                 'ldflags': ['-pie'], | 68                 'ldflags': ['-pie'], | 
| 63               }, | 69               }, | 
| 64             }, | 70             }, | 
| 65           ], | 71           ], | 
| 66         }], | 72         }], | 
| 67       ], | 73       ], | 
| 68     }], | 74     }], | 
| 69   ], | 75   ], | 
| 70 } | 76 } | 
| OLD | NEW | 
|---|