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

Side by Side Diff: build/features_override.gypi

Issue 6965007: Define os_posix in gyp files to get new Unix platforms added quickly (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: whoops, fixed mistake Created 9 years, 7 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 | « build/common.gypi ('k') | build/linux/system.gyp » ('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 # This file is only included in full-chromium builds, and overrides the 5 # This file is only included in full-chromium builds, and overrides the
6 # feature_defines variable in 6 # feature_defines variable in
7 # third_party/WebKit/Source/WebKit/chromium/features.gypi. 7 # third_party/WebKit/Source/WebKit/chromium/features.gypi.
8 { 8 {
9 'variables': { 9 'variables': {
10 # WARNING: This list of strings completely replaces the list in 10 # WARNING: This list of strings completely replaces the list in
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 'use_threaded_compositing%': 0, 81 'use_threaded_compositing%': 0,
82 'enable_svg%': 1, 82 'enable_svg%': 1,
83 'enable_touch_events%': 1, 83 'enable_touch_events%': 1,
84 'use_skia_gpu%': 0, 84 'use_skia_gpu%': 0,
85 }, 85 },
86 'use_accelerated_compositing%': '<(use_accelerated_compositing)', 86 'use_accelerated_compositing%': '<(use_accelerated_compositing)',
87 'use_threaded_compositing%': '<(use_threaded_compositing)', 87 'use_threaded_compositing%': '<(use_threaded_compositing)',
88 'enable_svg%': '<(enable_svg)', 88 'enable_svg%': '<(enable_svg)',
89 'enable_touch_events%': '<(enable_touch_events)', 89 'enable_touch_events%': '<(enable_touch_events)',
90 'conditions': [ 90 'conditions': [
91 ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing= =1', { 91 ['use_accelerated_compositing==1', {
92 'feature_defines': [ 92 'feature_defines': [
93 'WTF_USE_ACCELERATED_COMPOSITING=1', 93 'WTF_USE_ACCELERATED_COMPOSITING=1',
94 'ENABLE_3D_RENDERING=1', 94 'ENABLE_3D_RENDERING=1',
95 'ENABLE_ACCELERATED_2D_CANVAS=1', 95 'ENABLE_ACCELERATED_2D_CANVAS=1',
96 ], 96 ],
97 'use_accelerated_compositing': 1, 97 'use_accelerated_compositing': 1,
98 }], 98 }],
99 ['use_accelerated_compositing==1 and use_threaded_compositing==1', { 99 ['use_accelerated_compositing==1 and use_threaded_compositing==1', {
100 'feature_defines': [ 100 'feature_defines': [
101 'WTF_USE_THREADED_COMPOSITING=1', 101 'WTF_USE_THREADED_COMPOSITING=1',
(...skipping 20 matching lines...) Expand all
122 # require changes in gyp. 122 # require changes in gyp.
123 }, 123 },
124 124
125 } 125 }
126 126
127 # Local Variables: 127 # Local Variables:
128 # tab-width:2 128 # tab-width:2
129 # indent-tabs-mode:nil 129 # indent-tabs-mode:nil
130 # End: 130 # End:
131 # vim: set expandtab tabstop=2 shiftwidth=2: 131 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698