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 5109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5120 }, | 5120 }, |
| 5121 }], | 5121 }], |
| 5122 ['enable_new_npdevice_api==1', { | 5122 ['enable_new_npdevice_api==1', { |
| 5123 'target_defaults': { | 5123 'target_defaults': { |
| 5124 'defines': [ | 5124 'defines': [ |
| 5125 'ENABLE_NEW_NPDEVICE_API', | 5125 'ENABLE_NEW_NPDEVICE_API', |
| 5126 ], | 5126 ], |
| 5127 }, | 5127 }, |
| 5128 }], | 5128 }], |
| 5129 # Don't warn about the "typedef 'foo' locally defined but not used" | 5129 # Don't warn about the "typedef 'foo' locally defined but not used" |
| 5130 # for gcc 4.8. | 5130 # for gcc 4.8. We need a special case to handle the android webview build |
| 5131 # on mac because the host gcc there doesn't accept this flag, but the target | |
| 5132 # gcc may require it. | |
| 5131 # TODO: remove this flag once all builds work. See crbug.com/227506 | 5133 # TODO: remove this flag once all builds work. See crbug.com/227506 |
| 5132 ['gcc_version>=48', { | 5134 ['gcc_version>=48 and (android_webview_build==0 or host_os!="mac")', { |
|
Nico
2014/05/09 15:30:39
I'd revert this part…
| |
| 5133 'target_defaults': { | 5135 'target_defaults': { |
| 5134 'cflags': [ | 5136 'cflags': [ |
| 5135 '-Wno-unused-local-typedefs', | 5137 '-Wno-unused-local-typedefs', |
| 5136 ], | 5138 ], |
| 5137 }, | 5139 }, |
| 5138 }], | 5140 }], |
| 5141 ['gcc_version>=48 and android_webview_build==1 and host_os=="mac"', { | |
|
Nico
2014/05/09 15:30:39
and instead do cflags! here and remove it again.
| |
| 5142 'target_defaults': { | |
| 5143 'target_conditions': [ | |
| 5144 ['_toolset=="target"', { | |
| 5145 'cflags': [ | |
| 5146 '-Wno-unused-local-typedefs', | |
| 5147 ], | |
| 5148 }], | |
| 5149 ], | |
| 5150 }, | |
| 5151 }], | |
| 5139 ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' | 5152 ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' |
| 5140 'and OS!="win"', { | 5153 'and OS!="win"', { |
| 5141 'make_global_settings': [ | 5154 'make_global_settings': [ |
| 5142 ['CC', '<(make_clang_dir)/bin/clang'], | 5155 ['CC', '<(make_clang_dir)/bin/clang'], |
| 5143 ['CXX', '<(make_clang_dir)/bin/clang++'], | 5156 ['CXX', '<(make_clang_dir)/bin/clang++'], |
| 5144 ['CC.host', '$(CC)'], | 5157 ['CC.host', '$(CC)'], |
| 5145 ['CXX.host', '$(CXX)'], | 5158 ['CXX.host', '$(CXX)'], |
| 5146 ], | 5159 ], |
| 5147 }], | 5160 }], |
| 5148 ['clang==1 and OS=="win"', { | 5161 ['clang==1 and OS=="win"', { |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5244 # settings in target dicts. SYMROOT is a special case, because many other | 5257 # settings in target dicts. SYMROOT is a special case, because many other |
| 5245 # Xcode variables depend on it, including variables such as | 5258 # Xcode variables depend on it, including variables such as |
| 5246 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5259 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5247 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5260 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5248 # files to appear (when present) in the UI as actual files and not red | 5261 # files to appear (when present) in the UI as actual files and not red |
| 5249 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5262 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5250 # and therefore SYMROOT, needs to be set at the project level. | 5263 # and therefore SYMROOT, needs to be set at the project level. |
| 5251 'SYMROOT': '<(DEPTH)/xcodebuild', | 5264 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5252 }, | 5265 }, |
| 5253 } | 5266 } |
| OLD | NEW |