| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1545 ], | 1545 ], |
| 1546 }], | 1546 }], |
| 1547 | 1547 |
| 1548 ['asan==1 and OS!="win"', { | 1548 ['asan==1 and OS!="win"', { |
| 1549 'clang%': 1, | 1549 'clang%': 1, |
| 1550 }], | 1550 }], |
| 1551 ['asan==1 and OS=="mac"', { | 1551 ['asan==1 and OS=="mac"', { |
| 1552 # See http://crbug.com/145503. | 1552 # See http://crbug.com/145503. |
| 1553 'component': "static_library", | 1553 'component': "static_library", |
| 1554 # TODO(glider): we do not strip ASan binaries until the dynamic ASan | 1554 # TODO(glider): we do not strip ASan binaries until the dynamic ASan |
| 1555 # runtime is fully adopted. See http://crbug.com/170629. | 1555 # runtime is fully adopted. See http://crbug.com/242503. |
| 1556 'mac_strip_release': 0, | 1556 'mac_strip_release': 0, |
| 1557 }], | 1557 }], |
| 1558 ['tsan==1', { | 1558 ['tsan==1', { |
| 1559 'clang%': 1, | 1559 'clang%': 1, |
| 1560 }], | 1560 }], |
| 1561 ['msan==1', { | 1561 ['msan==1', { |
| 1562 'clang%': 1, | 1562 'clang%': 1, |
| 1563 }], | 1563 }], |
| 1564 | 1564 |
| 1565 ['OS=="linux" and clang_type_profiler==1', { | 1565 ['OS=="linux" and clang_type_profiler==1', { |
| (...skipping 2154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3720 # gnu++11 instead of c++11 is needed because some code uses | 3720 # gnu++11 instead of c++11 is needed because some code uses |
| 3721 # typeof() (a GNU extension). | 3721 # typeof() (a GNU extension). |
| 3722 # TODO(thakis): Eventually switch this to c++11 instead of | 3722 # TODO(thakis): Eventually switch this to c++11 instead of |
| 3723 # gnu++11 (once typeof can be removed, which is blocked on c++11 | 3723 # gnu++11 (once typeof can be removed, which is blocked on c++11 |
| 3724 # being available everywhere). | 3724 # being available everywhere). |
| 3725 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all | 3725 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all |
| 3726 # bots use xcode 4 -- http://crbug.com/147515). | 3726 # bots use xcode 4 -- http://crbug.com/147515). |
| 3727 '$(inherited)', '-std=gnu++11', | 3727 '$(inherited)', '-std=gnu++11', |
| 3728 ], | 3728 ], |
| 3729 }], | 3729 }], |
| 3730 # TODO(thakis): Reenable plugins with once | 3730 ['clang==1 and clang_use_chrome_plugins==1', { |
| 3731 # tools/clang/scripts/update.sh no longer pins clang to an ancient | |
| 3732 # version for asan (http://crbug.com/170629) | |
| 3733 ['clang==1 and clang_use_chrome_plugins==1 and asan!=1', { | |
| 3734 'OTHER_CFLAGS': [ | 3731 'OTHER_CFLAGS': [ |
| 3735 '<@(clang_chrome_plugins_flags)', | 3732 '<@(clang_chrome_plugins_flags)', |
| 3736 ], | 3733 ], |
| 3737 }], | 3734 }], |
| 3738 ['clang==1 and clang_load!=""', { | 3735 ['clang==1 and clang_load!=""', { |
| 3739 'OTHER_CFLAGS': [ | 3736 'OTHER_CFLAGS': [ |
| 3740 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3737 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 3741 ], | 3738 ], |
| 3742 }], | 3739 }], |
| 3743 ['clang==1 and clang_add_plugin!=""', { | 3740 ['clang==1 and clang_add_plugin!=""', { |
| (...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4439 # settings in target dicts. SYMROOT is a special case, because many other | 4436 # settings in target dicts. SYMROOT is a special case, because many other |
| 4440 # Xcode variables depend on it, including variables such as | 4437 # Xcode variables depend on it, including variables such as |
| 4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4438 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4439 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4443 # files to appear (when present) in the UI as actual files and not red | 4440 # files to appear (when present) in the UI as actual files and not red |
| 4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4441 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4445 # and therefore SYMROOT, needs to be set at the project level. | 4442 # and therefore SYMROOT, needs to be set at the project level. |
| 4446 'SYMROOT': '<(DEPTH)/xcodebuild', | 4443 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4447 }, | 4444 }, |
| 4448 } | 4445 } |
| OLD | NEW |