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

Side by Side Diff: build/common.gypi

Issue 8384004: Set use_skia=1 by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | webkit/tools/layout_tests/test_expectations.txt » ('j') | 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 # infrastructure (trybots etc.). Enable by setting to 1 in 247 # infrastructure (trybots etc.). Enable by setting to 1 in
248 # ~/.gyp/include.gypi or via the GYP command line for ~20-25% 248 # ~/.gyp/include.gypi or via the GYP command line for ~20-25%
249 # faster builds. 249 # faster builds.
250 'chromium_win_pch%': 0, 250 'chromium_win_pch%': 0,
251 251
252 'conditions': [ 252 'conditions': [
253 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 253 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
254 # the 'conditions' clause. Initial attempts resulted in chromium and 254 # the 'conditions' clause. Initial attempts resulted in chromium and
255 # webkit disagreeing on its setting. 255 # webkit disagreeing on its setting.
256 ['OS=="mac"', { 256 ['OS=="mac"', {
257 'use_skia%': 0, 257 'use_skia%': 1,
258 # Mac uses clang by default, so turn on the plugin as well. 258 # Mac uses clang by default, so turn on the plugin as well.
259 'clang_use_chrome_plugins%': 1, 259 'clang_use_chrome_plugins%': 1,
260 }, { 260 }, {
261 'use_skia%': 1, 261 'use_skia%': 1,
262 }], 262 }],
263 263
264 # A flag for POSIX platforms 264 # A flag for POSIX platforms
265 ['OS=="win"', { 265 ['OS=="win"', {
266 'os_posix%': 0, 266 'os_posix%': 0,
267 }, { 267 }, {
(...skipping 2334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2602 # settings in target dicts. SYMROOT is a special case, because many other 2602 # settings in target dicts. SYMROOT is a special case, because many other
2603 # Xcode variables depend on it, including variables such as 2603 # Xcode variables depend on it, including variables such as
2604 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2604 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2605 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2605 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2606 # files to appear (when present) in the UI as actual files and not red 2606 # files to appear (when present) in the UI as actual files and not red
2607 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2607 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2608 # and therefore SYMROOT, needs to be set at the project level. 2608 # and therefore SYMROOT, needs to be set at the project level.
2609 'SYMROOT': '<(DEPTH)/xcodebuild', 2609 'SYMROOT': '<(DEPTH)/xcodebuild',
2610 }, 2610 },
2611 } 2611 }
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698