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

Side by Side Diff: base/base.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 | « no previous file | components/nacl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 # base/test/test_suite.h 1005 # base/test/test_suite.h
1006 # gtk/gtk.h 1006 # gtk/gtk.h
1007 '../build/linux/system.gyp:gtk', 1007 '../build/linux/system.gyp:gtk',
1008 ], 1008 ],
1009 }], 1009 }],
1010 ], 1010 ],
1011 }, 1011 },
1012 { 1012 {
1013 'target_name': 'sanitizer_options', 1013 'target_name': 'sanitizer_options',
1014 'type': 'static_library', 1014 'type': 'static_library',
1015 'variables': { 1015 'toolsets': ['host', 'target'],
1016 'variables': {
1016 # Every target is going to depend on sanitizer_options, so allow 1017 # Every target is going to depend on sanitizer_options, so allow
1017 # this one to depend on itself. 1018 # this one to depend on itself.
1018 'prune_self_dependency': 1, 1019 'prune_self_dependency': 1,
1019 # Do not let 'none' targets depend on this one, they don't need to. 1020 # Do not let 'none' targets depend on this one, they don't need to.
1020 'link_dependency': 1, 1021 'link_dependency': 1,
1021 }, 1022 },
1022 'sources': [ 1023 'sources': [
1023 'debug/sanitizer_options.cc', 1024 'debug/sanitizer_options.cc',
1024 ], 1025 ],
1025 'include_dirs': [ 1026 'include_dirs': [
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 'base_unittests.isolate', 1491 'base_unittests.isolate',
1491 ], 1492 ],
1492 'sources': [ 1493 'sources': [
1493 'base_unittests.isolate', 1494 'base_unittests.isolate',
1494 ], 1495 ],
1495 }, 1496 },
1496 ], 1497 ],
1497 }], 1498 }],
1498 ], 1499 ],
1499 } 1500 }
OLDNEW
« no previous file with comments | « no previous file | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698