| 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 4135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4146 # which we no longer use. Check if it makes sense to remove | 4146 # which we no longer use. Check if it makes sense to remove |
| 4147 # this as well. http://crbug.com/316352 | 4147 # this as well. http://crbug.com/316352 |
| 4148 '-Wno-unneeded-internal-declaration', | 4148 '-Wno-unneeded-internal-declaration', |
| 4149 | 4149 |
| 4150 # Warns on switches on enums that cover all enum values but | 4150 # Warns on switches on enums that cover all enum values but |
| 4151 # also contain a default: branch. Chrome is full of that. | 4151 # also contain a default: branch. Chrome is full of that. |
| 4152 '-Wno-covered-switch-default', | 4152 '-Wno-covered-switch-default', |
| 4153 | 4153 |
| 4154 # Warns when a const char[] is converted to bool. | 4154 # Warns when a const char[] is converted to bool. |
| 4155 '-Wstring-conversion', | 4155 '-Wstring-conversion', |
| 4156 |
| 4157 # Clang considers the `register` keyword as deprecated, but |
| 4158 # e.g. code generated by flex (used in angle) contains that |
| 4159 # keyword. http://crbug.com/255186 |
| 4160 '-Wno-deprecated-register', |
| 4156 ], | 4161 ], |
| 4157 | 4162 |
| 4158 'conditions': [ | 4163 'conditions': [ |
| 4159 ['clang_xcode==0', { | 4164 ['clang_xcode==0', { |
| 4160 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', | 4165 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', |
| 4161 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', | 4166 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', |
| 4162 | |
| 4163 'WARNING_CFLAGS': [ | |
| 4164 # Clang considers the `register` keyword as deprecated, but | |
| 4165 # e.g. code generated by flex (used in angle) contains that | |
| 4166 # keyword. http://crbug.com/255186 | |
| 4167 # | |
| 4168 # Note: clang as shipped with Xcode is older and does not | |
| 4169 # treat the `register` as deprecated and does not define | |
| 4170 # this flag, so don't enable it if "clang_xcode" is "1". | |
| 4171 '-Wno-deprecated-register', | |
| 4172 ], | |
| 4173 }], | 4167 }], |
| 4174 ], | 4168 ], |
| 4175 }], | 4169 }], |
| 4176 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { | 4170 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { |
| 4177 'OTHER_CFLAGS': [ | 4171 'OTHER_CFLAGS': [ |
| 4178 '<@(clang_chrome_plugins_flags)', | 4172 '<@(clang_chrome_plugins_flags)', |
| 4179 ], | 4173 ], |
| 4180 }], | 4174 }], |
| 4181 ['clang==1 and clang_xcode==0 and clang_load!=""', { | 4175 ['clang==1 and clang_xcode==0 and clang_load!=""', { |
| 4182 'OTHER_CFLAGS': [ | 4176 'OTHER_CFLAGS': [ |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5052 # settings in target dicts. SYMROOT is a special case, because many other | 5046 # settings in target dicts. SYMROOT is a special case, because many other |
| 5053 # Xcode variables depend on it, including variables such as | 5047 # Xcode variables depend on it, including variables such as |
| 5054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5048 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5049 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5056 # files to appear (when present) in the UI as actual files and not red | 5050 # files to appear (when present) in the UI as actual files and not red |
| 5057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5051 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5058 # and therefore SYMROOT, needs to be set at the project level. | 5052 # and therefore SYMROOT, needs to be set at the project level. |
| 5059 'SYMROOT': '<(DEPTH)/xcodebuild', | 5053 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5060 }, | 5054 }, |
| 5061 } | 5055 } |
| OLD | NEW |