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

Side by Side Diff: trunk/src/components/nacl.gyp

Issue 237203003: Revert 263625 "Set the default ASan options for executables buil..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | « trunk/src/build/common.gypi ('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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ], 183 ],
184 'dependencies': [ 184 'dependencies': [
185 'nacl', 185 'nacl',
186 'nacl_common', 186 'nacl_common',
187 '../components/tracing.gyp:tracing', 187 '../components/tracing.gyp:tracing',
188 '../crypto/crypto.gyp:crypto', 188 '../crypto/crypto.gyp:crypto',
189 '../sandbox/sandbox.gyp:libc_urandom_override', 189 '../sandbox/sandbox.gyp:libc_urandom_override',
190 '../sandbox/sandbox.gyp:sandbox', 190 '../sandbox/sandbox.gyp:sandbox',
191 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 191 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
192 ], 192 ],
193 'ldflags!': [
194 # Do not pick the default ASan options from
195 # base/debug/sanitizer_options.cc to avoid a conflict with those
196 # in nacl/nacl_helper_linux.cc.
197 '-Wl,-u_sanitizer_options_link_helper',
198 ],
199 'defines': [ 193 'defines': [
200 '<@(nacl_defines)', 194 '<@(nacl_defines)',
201 # Allow .cc files to know if they're being compiled as part 195 # Allow .cc files to know if they're being compiled as part
202 # of nacl_helper. 196 # of nacl_helper.
203 'IN_NACL_HELPER=1', 197 'IN_NACL_HELPER=1',
204 ], 198 ],
205 'sources': [ 199 'sources': [
206 'nacl/loader/nacl_helper_linux.cc', 200 'nacl/loader/nacl_helper_linux.cc',
207 'nacl/loader/nacl_helper_linux.h', 201 'nacl/loader/nacl_helper_linux.h',
208 'nacl/loader/nacl_sandbox_linux.cc', 202 'nacl/loader/nacl_sandbox_linux.cc',
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 ], 402 ],
409 'include_dirs': [ 403 'include_dirs': [
410 '..', 404 '..',
411 ], 405 ],
412 'dependencies': [ 406 'dependencies': [
413 '../content/content.gyp:content_common', 407 '../content/content.gyp:content_common',
414 ], 408 ],
415 }, 409 },
416 ] 410 ]
417 } 411 }
OLDNEW
« no previous file with comments | « trunk/src/build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698