Chromium Code Reviews| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/base/', | |
| 8 }, | 9 }, |
| 9 'includes': [ | 10 'includes': [ |
| 10 '../build/win_precompile.gypi', | 11 '../build/win_precompile.gypi', |
| 11 'base.gypi', | 12 'base.gypi', |
| 12 ], | 13 ], |
| 13 'targets': [ | 14 'targets': [ |
| 14 { | 15 { |
| 15 'target_name': 'base', | 16 'target_name': 'base', |
| 16 'type': '<(component)', | 17 'type': '<(component)', |
| 17 'toolsets': ['host', 'target'], | 18 'toolsets': ['host', 'target'], |
| (...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 992 # Some targets may want to opt-out from ASan, TSan and MSan and link | 993 # Some targets may want to opt-out from ASan, TSan and MSan and link |
| 993 # without the corresponding runtime libraries. We drop the libc++ | 994 # without the corresponding runtime libraries. We drop the libc++ |
| 994 # dependency and omit the compiler flags to avoid bringing instrumented | 995 # dependency and omit the compiler flags to avoid bringing instrumented |
| 995 # code to those targets. | 996 # code to those targets. |
| 996 'conditions': [ | 997 'conditions': [ |
| 997 ['use_custom_libcxx==1', { | 998 ['use_custom_libcxx==1', { |
| 998 'dependencies!': [ | 999 'dependencies!': [ |
| 999 '../third_party/libc++/libc++.gyp:libcxx_proxy', | 1000 '../third_party/libc++/libc++.gyp:libcxx_proxy', |
| 1000 ], | 1001 ], |
| 1001 }], | 1002 }], |
| 1003 ['tsan==1', { | |
| 1004 'dependencies': [ | |
| 1005 'tsan_default_suppressions', | |
| 1006 ], | |
| 1007 'sources': [ | |
| 1008 '<(shared_generated_dir)/tsan_suppressions.c', | |
| 1009 ], | |
| 1010 }], | |
| 1002 ], | 1011 ], |
| 1003 'cflags!': [ | 1012 'cflags!': [ |
| 1004 '-fsanitize=address', | 1013 '-fsanitize=address', |
| 1005 '-fsanitize=thread', | 1014 '-fsanitize=thread', |
| 1006 '-fsanitize=memory', | 1015 '-fsanitize=memory', |
| 1007 '-fsanitize-memory-track-origins', | 1016 '-fsanitize-memory-track-origins', |
| 1008 ], | 1017 ], |
| 1009 'direct_dependent_settings': { | 1018 'direct_dependent_settings': { |
| 1010 'ldflags': [ | 1019 'ldflags': [ |
| 1011 '-Wl,-u_sanitizer_options_link_helper', | 1020 '-Wl,-u_sanitizer_options_link_helper', |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1482 'includes': [ | 1491 'includes': [ |
| 1483 '../build/isolate.gypi', | 1492 '../build/isolate.gypi', |
| 1484 'base_unittests.isolate', | 1493 'base_unittests.isolate', |
| 1485 ], | 1494 ], |
| 1486 'sources': [ | 1495 'sources': [ |
| 1487 'base_unittests.isolate', | 1496 'base_unittests.isolate', |
| 1488 ], | 1497 ], |
| 1489 }, | 1498 }, |
| 1490 ], | 1499 ], |
| 1491 }], | 1500 }], |
| 1501 ['tsan==1', { | |
| 1502 'targets': [ | |
| 1503 { | |
| 1504 'target_name': 'tsan_default_suppressions', | |
| 1505 'type': 'none', | |
| 1506 'actions': [ | |
| 1507 { | |
| 1508 'action_name': 'generate_tsan_suppressions', | |
| 1509 'variables': { | |
| 1510 'suppression_generator': '../tools/memory/suppression_string_gen .sh', | |
| 1511 'infile': '../tools/valgrind/tsan_v2/suppressions.txt', | |
| 1512 'outfile': '<(shared_generated_dir)/tsan_suppressions.c', | |
| 1513 }, | |
| 1514 'inputs': [ '<(infile)', | |
| 1515 '<(suppression_generator)'], | |
| 1516 'outputs': [ '<(outfile)' ], | |
| 1517 'action': [ | |
| 1518 '<(suppression_generator)', | |
| 1519 'kTSanDefaultSuppressions', '<(infile)', '<(outfile)', | |
| 1520 ], | |
| 1521 'process_outputs_as_sources': 1, | |
| 1522 'message': 'generating suppressions header from <(infile)', | |
|
Nico
2014/05/27 15:42:30
header?
Alexander Potapenko
2014/05/28 10:34:38
Used to be a header. Fixed.
| |
| 1523 }, | |
| 1524 ], | |
| 1525 }, | |
| 1526 ], | |
| 1527 }], | |
| 1492 ], | 1528 ], |
| 1493 } | 1529 } |
| OLD | NEW |