Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: components/nacl.gyp

Issue 212793010: Revert of Set the default ASan options for executables built with ASan on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_exe_main_gtk.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 ], 180 ],
181 'dependencies': [ 181 'dependencies': [
182 'nacl', 182 'nacl',
183 'nacl_common', 183 'nacl_common',
184 '../components/tracing.gyp:tracing', 184 '../components/tracing.gyp:tracing',
185 '../crypto/crypto.gyp:crypto', 185 '../crypto/crypto.gyp:crypto',
186 '../sandbox/sandbox.gyp:libc_urandom_override', 186 '../sandbox/sandbox.gyp:libc_urandom_override',
187 '../sandbox/sandbox.gyp:sandbox', 187 '../sandbox/sandbox.gyp:sandbox',
188 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 188 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
189 ], 189 ],
190 'ldflags!': [
191 # Do not pick the default ASan options from
192 # base/debug/sanitizer_options.cc to avoid th conflict with
193 # those in nacl/nacl_helper_linux.cc.
194 '-Wl,-u_sanitizer_options_link_helper',
195 ],
196 'defines': [ 190 'defines': [
197 '<@(nacl_defines)', 191 '<@(nacl_defines)',
198 # Allow .cc files to know if they're being compiled as part 192 # Allow .cc files to know if they're being compiled as part
199 # of nacl_helper. 193 # of nacl_helper.
200 'IN_NACL_HELPER=1', 194 'IN_NACL_HELPER=1',
201 ], 195 ],
202 'sources': [ 196 'sources': [
203 'nacl/loader/nacl_helper_linux.cc', 197 'nacl/loader/nacl_helper_linux.cc',
204 'nacl/loader/nacl_helper_linux.h', 198 'nacl/loader/nacl_helper_linux.h',
205 'nacl/loader/nacl_sandbox_linux.cc', 199 'nacl/loader/nacl_sandbox_linux.cc',
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 ], 394 ],
401 'include_dirs': [ 395 'include_dirs': [
402 '..', 396 '..',
403 ], 397 ],
404 'dependencies': [ 398 'dependencies': [
405 '../content/content.gyp:content_common', 399 '../content/content.gyp:content_common',
406 ], 400 ],
407 }, 401 },
408 ] 402 ]
409 } 403 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_exe_main_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698