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 # 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 1520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1531 ], | 1531 ], |
| 1532 }], | 1532 }], |
| 1533 | 1533 |
| 1534 ['asan==1 and OS!="win"', { | 1534 ['asan==1 and OS!="win"', { |
| 1535 'clang%': 1, | 1535 'clang%': 1, |
| 1536 }], | 1536 }], |
| 1537 ['asan==1 and OS=="mac"', { | 1537 ['asan==1 and OS=="mac"', { |
| 1538 # See http://crbug.com/145503. | 1538 # See http://crbug.com/145503. |
| 1539 'component': "static_library", | 1539 'component': "static_library", |
| 1540 # TODO(glider): we do not strip ASan binaries until the dynamic ASan | 1540 # TODO(glider): we do not strip ASan binaries until the dynamic ASan |
| 1541 # runtime is fully adopted. See http://crbug.com/170629. | 1541 # runtime is fully adopted. See http://crbug.com/170629. |
|
Nico
2013/05/01 19:13:46
Can this be removed, too?
Alexander Potapenko
2013/05/21 13:21:50
I've checked that recently and there still were pr
Nico
2013/05/21 19:19:55
Done.
| |
| 1542 'mac_strip_release': 0, | 1542 'mac_strip_release': 0, |
| 1543 }], | 1543 }], |
| 1544 ['tsan==1', { | 1544 ['tsan==1', { |
| 1545 'clang%': 1, | 1545 'clang%': 1, |
| 1546 }], | 1546 }], |
| 1547 ['msan==1', { | 1547 ['msan==1', { |
| 1548 'clang%': 1, | 1548 'clang%': 1, |
| 1549 }], | 1549 }], |
| 1550 | 1550 |
| 1551 ['OS=="linux" and clang_type_profiler==1', { | 1551 ['OS=="linux" and clang_type_profiler==1', { |
| (...skipping 2161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3713 # typeof() is also disabled in c++11 (but we could use | 3713 # typeof() is also disabled in c++11 (but we could use |
| 3714 # decltype() instead). | 3714 # decltype() instead). |
| 3715 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all | 3715 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all |
| 3716 # bots use xcode 4 -- http://crbug.com/147515). | 3716 # bots use xcode 4 -- http://crbug.com/147515). |
| 3717 # TODO(thakis): Eventually switch this to c++11 instead of | 3717 # TODO(thakis): Eventually switch this to c++11 instead of |
| 3718 # gnu++11 (once typeof can be removed, which is blocked on c++11 | 3718 # gnu++11 (once typeof can be removed, which is blocked on c++11 |
| 3719 # being available everywhere). | 3719 # being available everywhere). |
| 3720 '$(inherited)', '-std=gnu++11', | 3720 '$(inherited)', '-std=gnu++11', |
| 3721 ], | 3721 ], |
| 3722 }], | 3722 }], |
| 3723 # TODO(thakis): Reenable plugins with once | 3723 ['clang==1 and clang_use_chrome_plugins==1', { |
| 3724 # tools/clang/scripts/update.sh no longer pins clang to an ancient | |
| 3725 # version for asan (http://crbug.com/170629) | |
| 3726 ['clang==1 and clang_use_chrome_plugins==1 and asan!=1', { | |
| 3727 'OTHER_CFLAGS': [ | 3724 'OTHER_CFLAGS': [ |
| 3728 '<@(clang_chrome_plugins_flags)', | 3725 '<@(clang_chrome_plugins_flags)', |
| 3729 ], | 3726 ], |
| 3730 }], | 3727 }], |
| 3731 ['clang==1 and clang_load!=""', { | 3728 ['clang==1 and clang_load!=""', { |
| 3732 'OTHER_CFLAGS': [ | 3729 'OTHER_CFLAGS': [ |
| 3733 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3730 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 3734 ], | 3731 ], |
| 3735 }], | 3732 }], |
| 3736 ['clang==1 and clang_add_plugin!=""', { | 3733 ['clang==1 and clang_add_plugin!=""', { |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4400 # settings in target dicts. SYMROOT is a special case, because many other | 4397 # settings in target dicts. SYMROOT is a special case, because many other |
| 4401 # Xcode variables depend on it, including variables such as | 4398 # Xcode variables depend on it, including variables such as |
| 4402 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4399 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4403 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4400 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4404 # files to appear (when present) in the UI as actual files and not red | 4401 # files to appear (when present) in the UI as actual files and not red |
| 4405 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4402 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4406 # and therefore SYMROOT, needs to be set at the project level. | 4403 # and therefore SYMROOT, needs to be set at the project level. |
| 4407 'SYMROOT': '<(DEPTH)/xcodebuild', | 4404 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4408 }, | 4405 }, |
| 4409 } | 4406 } |
| OLD | NEW |