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 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2127 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'], | 2127 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'], |
2128 }], | 2128 }], |
2129 ['enable_resource_whitelist_generation==1 and OS=="win"', { | 2129 ['enable_resource_whitelist_generation==1 and OS=="win"', { |
2130 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'], | 2130 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'], |
2131 }], | 2131 }], |
2132 ['enable_mdns==1 or OS=="mac"', { | 2132 ['enable_mdns==1 or OS=="mac"', { |
2133 'grit_defines': ['-D', 'enable_service_discovery'], | 2133 'grit_defines': ['-D', 'enable_service_discovery'], |
2134 'enable_service_discovery%': 1 | 2134 'enable_service_discovery%': 1 |
2135 }], | 2135 }], |
2136 ['clang_use_chrome_plugins==1 and OS!="win"', { | 2136 ['clang_use_chrome_plugins==1 and OS!="win"', { |
2137 'clang_chrome_plugins_flags': [ | 2137 'variables': { |
2138 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | 2138 'clang_chrome_plugins_flags': [ |
2139 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | |
2140 ], | |
2141 }, | |
2142 'conditions': [ | |
2143 # TODO(dcheng): https://crbug.com/417463 -- work to enable this flag | |
2144 # on all platforms is currently underway. | |
2145 ['OS=="linux" and chromeos==0', { | |
2146 'clang_chrome_plugins_flags': [ | |
cjhopman
2014/12/30 23:55:30
gyp list merging is done by appending and I believ
dcheng
2014/12/30 23:57:03
thakis@ mentioned this as well.
I took an old pat
dcheng
2014/12/31 01:33:54
Done.
| |
2147 '<@(clang_chrome_plugins_flags)', | |
2148 '-Xclang', | |
2149 '-plugin-arg-find-bad-constructs', | |
2150 '-Xclang', | |
2151 'strict-virtual-specifiers', | |
2152 ], | |
2153 }, { | |
2154 'clang_chrome_plugins_flags': [ | |
2155 '<@(clang_chrome_plugins_flags)', | |
2156 ], | |
2157 }], | |
2139 ], | 2158 ], |
2140 }], | 2159 }], |
2141 ['asan==1 or msan==1 or lsan==1 or tsan==1', { | 2160 ['asan==1 or msan==1 or lsan==1 or tsan==1', { |
2142 'clang%': 1, | 2161 'clang%': 1, |
2143 'use_allocator%': 'none', | 2162 'use_allocator%': 'none', |
2144 'use_sanitizer_options%': 1, | 2163 'use_sanitizer_options%': 1, |
2145 }], | 2164 }], |
2146 ['asan==1 and OS=="linux" and chromeos==0', { | 2165 ['asan==1 and OS=="linux" and chromeos==0', { |
2147 'use_custom_libcxx%': 1, | 2166 'use_custom_libcxx%': 1, |
2148 }], | 2167 }], |
(...skipping 3678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5827 # settings in target dicts. SYMROOT is a special case, because many other | 5846 # settings in target dicts. SYMROOT is a special case, because many other |
5828 # Xcode variables depend on it, including variables such as | 5847 # Xcode variables depend on it, including variables such as |
5829 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5848 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
5830 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5849 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
5831 # files to appear (when present) in the UI as actual files and not red | 5850 # files to appear (when present) in the UI as actual files and not red |
5832 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5851 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
5833 # and therefore SYMROOT, needs to be set at the project level. | 5852 # and therefore SYMROOT, needs to be set at the project level. |
5834 'SYMROOT': '<(DEPTH)/xcodebuild', | 5853 'SYMROOT': '<(DEPTH)/xcodebuild', |
5835 }, | 5854 }, |
5836 } | 5855 } |
OLD | NEW |