Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: build/common.gypi

Issue 8054015: Disable Skia on Mac until we resolve http://code.google.com/p/chromium/issues/detail?id=98079 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 # infrastructure (trybots etc.). Enable by setting to 1 in 218 # infrastructure (trybots etc.). Enable by setting to 1 in
219 # ~/.gyp/include.gypi or via the GYP command line for ~20-25% 219 # ~/.gyp/include.gypi or via the GYP command line for ~20-25%
220 # faster builds. 220 # faster builds.
221 'chromium_win_pch%': 0, 221 'chromium_win_pch%': 0,
222 222
223 'conditions': [ 223 'conditions': [
224 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 224 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
225 # the 'conditions' clause. Initial attempts resulted in chromium and 225 # the 'conditions' clause. Initial attempts resulted in chromium and
226 # webkit disagreeing on its setting. 226 # webkit disagreeing on its setting.
227 ['OS=="mac"', { 227 ['OS=="mac"', {
228 'use_skia%': 1, 228 'use_skia%': 0,
229 # Mac uses clang by default, so turn on the plugin as well. 229 # Mac uses clang by default, so turn on the plugin as well.
230 'clang_use_chrome_plugins%': 1, 230 'clang_use_chrome_plugins%': 1,
231 }, { 231 }, {
232 'use_skia%': 1, 232 'use_skia%': 1,
233 }], 233 }],
234 234
235 # A flag for POSIX platforms 235 # A flag for POSIX platforms
236 ['OS=="win"', { 236 ['OS=="win"', {
237 'os_posix%': 0, 237 'os_posix%': 0,
238 }, { 238 }, {
(...skipping 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after
2438 # settings in target dicts. SYMROOT is a special case, because many other 2438 # settings in target dicts. SYMROOT is a special case, because many other
2439 # Xcode variables depend on it, including variables such as 2439 # Xcode variables depend on it, including variables such as
2440 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2440 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2441 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2441 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2442 # files to appear (when present) in the UI as actual files and not red 2442 # files to appear (when present) in the UI as actual files and not red
2443 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2443 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2444 # and therefore SYMROOT, needs to be set at the project level. 2444 # and therefore SYMROOT, needs to be set at the project level.
2445 'SYMROOT': '<(DEPTH)/xcodebuild', 2445 'SYMROOT': '<(DEPTH)/xcodebuild',
2446 }, 2446 },
2447 } 2447 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698