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

Side by Side Diff: components/nacl.gyp

Issue 213113002: Add the host toolset to base:sanitizer_options. Fix a typo in nacl.gyp (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 | « base/base.gyp ('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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 'nacl', 184 'nacl',
185 'nacl_common', 185 'nacl_common',
186 '../components/tracing.gyp:tracing', 186 '../components/tracing.gyp:tracing',
187 '../crypto/crypto.gyp:crypto', 187 '../crypto/crypto.gyp:crypto',
188 '../sandbox/sandbox.gyp:libc_urandom_override', 188 '../sandbox/sandbox.gyp:libc_urandom_override',
189 '../sandbox/sandbox.gyp:sandbox', 189 '../sandbox/sandbox.gyp:sandbox',
190 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 190 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
191 ], 191 ],
192 'ldflags!': [ 192 'ldflags!': [
193 # Do not pick the default ASan options from 193 # Do not pick the default ASan options from
194 # base/debug/sanitizer_options.cc to avoid th conflict with 194 # base/debug/sanitizer_options.cc to avoid a conflict with those
195 # those in nacl/nacl_helper_linux.cc. 195 # in nacl/nacl_helper_linux.cc.
196 '-Wl,-u_sanitizer_options_link_helper', 196 '-Wl,-u_sanitizer_options_link_helper',
197 ], 197 ],
198 'defines': [ 198 'defines': [
199 '<@(nacl_defines)', 199 '<@(nacl_defines)',
200 # Allow .cc files to know if they're being compiled as part 200 # Allow .cc files to know if they're being compiled as part
201 # of nacl_helper. 201 # of nacl_helper.
202 'IN_NACL_HELPER=1', 202 'IN_NACL_HELPER=1',
203 ], 203 ],
204 'sources': [ 204 'sources': [
205 'nacl/loader/nacl_helper_linux.cc', 205 'nacl/loader/nacl_helper_linux.cc',
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 ], 402 ],
403 'include_dirs': [ 403 'include_dirs': [
404 '..', 404 '..',
405 ], 405 ],
406 'dependencies': [ 406 'dependencies': [
407 '../content/content.gyp:content_common', 407 '../content/content.gyp:content_common',
408 ], 408 ],
409 }, 409 },
410 ] 410 ]
411 } 411 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698