| 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 2118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2129 'grit_defines': ['-D', 'enable_service_discovery'], | 2129 'grit_defines': ['-D', 'enable_service_discovery'], |
| 2130 'enable_service_discovery%': 1 | 2130 'enable_service_discovery%': 1 |
| 2131 }], | 2131 }], |
| 2132 ['clang_use_chrome_plugins==1 and OS!="win"', { | 2132 ['clang_use_chrome_plugins==1 and OS!="win"', { |
| 2133 'clang_chrome_plugins_flags': [ | 2133 'clang_chrome_plugins_flags': [ |
| 2134 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | 2134 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
| 2135 ], | 2135 ], |
| 2136 'conditions': [ | 2136 'conditions': [ |
| 2137 # TODO(dcheng): https://crbug.com/417463 -- work to enable this flag | 2137 # TODO(dcheng): https://crbug.com/417463 -- work to enable this flag |
| 2138 # on all platforms is currently underway. | 2138 # on all platforms is currently underway. |
| 2139 ['(OS=="linux" and chromeos==0) or OS=="mac"', { | 2139 ['(OS=="linux" and chromeos==0) or OS=="mac" or OS=="ios"', { |
| 2140 'clang_chrome_plugins_flags': [ | 2140 'clang_chrome_plugins_flags': [ |
| 2141 '-Xclang', | 2141 '-Xclang', |
| 2142 '-plugin-arg-find-bad-constructs', | 2142 '-plugin-arg-find-bad-constructs', |
| 2143 '-Xclang', | 2143 '-Xclang', |
| 2144 'strict-virtual-specifiers', | 2144 'strict-virtual-specifiers', |
| 2145 ], | 2145 ], |
| 2146 }], | 2146 }], |
| 2147 ], | 2147 ], |
| 2148 }], | 2148 }], |
| 2149 ['asan==1 or msan==1 or lsan==1 or tsan==1', { | 2149 ['asan==1 or msan==1 or lsan==1 or tsan==1', { |
| (...skipping 3691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5841 # settings in target dicts. SYMROOT is a special case, because many other | 5841 # settings in target dicts. SYMROOT is a special case, because many other |
| 5842 # Xcode variables depend on it, including variables such as | 5842 # Xcode variables depend on it, including variables such as |
| 5843 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5843 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5844 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5844 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5845 # files to appear (when present) in the UI as actual files and not red | 5845 # files to appear (when present) in the UI as actual files and not red |
| 5846 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5846 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5847 # and therefore SYMROOT, needs to be set at the project level. | 5847 # and therefore SYMROOT, needs to be set at the project level. |
| 5848 'SYMROOT': '<(DEPTH)/xcodebuild', | 5848 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5849 }, | 5849 }, |
| 5850 } | 5850 } |
| OLD | NEW |