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

Side by Side Diff: build/features_override.gypi

Issue 836001: Enable the touch events feature for the full chromium build, and allow for the (Closed)
Patch Set: Created 10 years, 9 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
« 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 third_party/WebKit/WebKit/chromium/features.gypi. 6 # feature_defines variable in third_party/WebKit/WebKit/chromium/features.gypi.
7 { 7 {
8 'variables': { 8 'variables': {
9 # WARNING: This list of strings completely replaces the list in 9 # WARNING: This list of strings completely replaces the list in
10 # features.gypi. Therefore, if an enable is listed in features.gypi 10 # features.gypi. Therefore, if an enable is listed in features.gypi
(...skipping 19 matching lines...) Expand all
30 'ENABLE_SANDBOX=1', 30 'ENABLE_SANDBOX=1',
31 'ENABLE_XSLT=1', 31 'ENABLE_XSLT=1',
32 'ENABLE_XPATH=1', 32 'ENABLE_XPATH=1',
33 'ENABLE_SHARED_WORKERS=1', 33 'ENABLE_SHARED_WORKERS=1',
34 'ENABLE_SVG=<(enable_svg)', 34 'ENABLE_SVG=<(enable_svg)',
35 'ENABLE_SVG_ANIMATION=<(enable_svg)', 35 'ENABLE_SVG_ANIMATION=<(enable_svg)',
36 'ENABLE_SVG_AS_IMAGE=<(enable_svg)', 36 'ENABLE_SVG_AS_IMAGE=<(enable_svg)',
37 'ENABLE_SVG_USE=<(enable_svg)', 37 'ENABLE_SVG_USE=<(enable_svg)',
38 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)', 38 'ENABLE_SVG_FOREIGN_OBJECT=<(enable_svg)',
39 'ENABLE_SVG_FONTS=<(enable_svg)', 39 'ENABLE_SVG_FONTS=<(enable_svg)',
40 'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
40 'ENABLE_VIDEO=1', 41 'ENABLE_VIDEO=1',
41 'ENABLE_WEB_SOCKETS=1', 42 'ENABLE_WEB_SOCKETS=1',
42 'ENABLE_WORKERS=1', 43 'ENABLE_WORKERS=1',
43 ], 44 ],
44 # We have to nest variables inside variables so that they can be overridden 45 # We have to nest variables inside variables so that they can be overridden
45 # through GYP_DEFINES. 46 # through GYP_DEFINES.
46 'variables': { 47 'variables': {
47 'use_accelerated_compositing%': 0, 48 'use_accelerated_compositing%': 0,
48 'enable_svg%': 1, 49 'enable_svg%': 1,
50 'enable_touch_events%': 1,
49 }, 51 },
50 'use_accelerated_compositing%': '<(use_accelerated_compositing)', 52 'use_accelerated_compositing%': '<(use_accelerated_compositing)',
51 'enable_svg%': '<(enable_svg)', 53 'enable_svg%': '<(enable_svg)',
54 'enable_touch_events%': '<(enable_touch_events)',
52 'conditions': [ 55 'conditions': [
53 ['use_accelerated_compositing==1', { 56 ['use_accelerated_compositing==1', {
54 'feature_defines': ['WTF_USE_ACCELERATED_COMPOSITING=1'], 57 'feature_defines': ['WTF_USE_ACCELERATED_COMPOSITING=1'],
55 }], 58 }],
56 ], 59 ],
57 # TODO: If the need arises, create a mechanism that will intelligently 60 # TODO: If the need arises, create a mechanism that will intelligently
58 # merge the lists rather than replace one with the other. This may 61 # merge the lists rather than replace one with the other. This may
59 # require changes in gyp. 62 # require changes in gyp.
60 }, 63 },
61 64
62 } 65 }
63 66
64 # Local Variables: 67 # Local Variables:
65 # tab-width:2 68 # tab-width:2
66 # indent-tabs-mode:nil 69 # indent-tabs-mode:nil
67 # End: 70 # End:
68 # vim: set expandtab tabstop=2 shiftwidth=2: 71 # vim: set expandtab tabstop=2 shiftwidth=2:
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