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

Side by Side Diff: build/common.gypi

Issue 7792094: touchui: support XInput2 MT (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Add gyp switch to support both XI2.0 and XI2.1. Correct the style issues also. Created 9 years, 3 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
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 207
208 # Enable Web Intents and supporting UI. 208 # Enable Web Intents and supporting UI.
209 'enable_web_intents%': 0, 209 'enable_web_intents%': 0,
210 210
211 # Smooth scrolling is disabled by default. 211 # Smooth scrolling is disabled by default.
212 'enable_smooth_scrolling%': 0, 212 'enable_smooth_scrolling%': 0,
213 213
214 # Webrtc compilation is enabled by default. Set to 0 to disable. 214 # Webrtc compilation is enabled by default. Set to 0 to disable.
215 'enable_webrtc%': 1, 215 'enable_webrtc%': 1,
216 216
217 # XInput 2.1 for touch events is disabled by default.
218 'use_xi2_1%': 0,
219
217 'conditions': [ 220 'conditions': [
218 # Use Skia as WebKit renderer on Mac 221 # Use Skia as WebKit renderer on Mac
219 ['OS=="mac"', { 222 ['OS=="mac"', {
220 'use_skia%': 0, 223 'use_skia%': 0,
221 }, { 224 }, {
222 'use_skia%': 1, 225 'use_skia%': 1,
223 }], 226 }],
224 227
225 # A flag for POSIX platforms 228 # A flag for POSIX platforms
226 ['OS=="win"', { 229 ['OS=="win"', {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 'use_aura%': '<(use_aura)', 301 'use_aura%': '<(use_aura)',
299 'os_posix%': '<(os_posix)', 302 'os_posix%': '<(os_posix)',
300 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 303 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
301 'use_skia%': '<(use_skia)', 304 'use_skia%': '<(use_skia)',
302 'use_x11%': '<(use_x11)', 305 'use_x11%': '<(use_x11)',
303 'use_gnome_keyring%': '<(use_gnome_keyring)', 306 'use_gnome_keyring%': '<(use_gnome_keyring)',
304 'linux_fpic%': '<(linux_fpic)', 307 'linux_fpic%': '<(linux_fpic)',
305 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 308 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
306 'chromeos%': '<(chromeos)', 309 'chromeos%': '<(chromeos)',
307 'touchui%': '<(touchui)', 310 'touchui%': '<(touchui)',
311 'use_xi2_1%':'<(use_xi2_1)',
308 'webui_dialogs%': '<(webui_dialogs)', 312 'webui_dialogs%': '<(webui_dialogs)',
309 'file_manager_extension%': '<(file_manager_extension)', 313 'file_manager_extension%': '<(file_manager_extension)',
310 'webui_task_manager%': '<(webui_task_manager)', 314 'webui_task_manager%': '<(webui_task_manager)',
311 'inside_chromium_build%': '<(inside_chromium_build)', 315 'inside_chromium_build%': '<(inside_chromium_build)',
312 'fastbuild%': '<(fastbuild)', 316 'fastbuild%': '<(fastbuild)',
313 'python_ver%': '<(python_ver)', 317 'python_ver%': '<(python_ver)',
314 'armv7%': '<(armv7)', 318 'armv7%': '<(armv7)',
315 'arm_neon%': '<(arm_neon)', 319 'arm_neon%': '<(arm_neon)',
316 'sysroot%': '<(sysroot)', 320 'sysroot%': '<(sysroot)',
317 'disable_sse2%': '<(disable_sse2)', 321 'disable_sse2%': '<(disable_sse2)',
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 }], 797 }],
794 ['use_aura==1', { 798 ['use_aura==1', {
795 'defines': ['USE_AURA=1'], 799 'defines': ['USE_AURA=1'],
796 }], 800 }],
797 ['chromeos==1', { 801 ['chromeos==1', {
798 'defines': ['OS_CHROMEOS=1'], 802 'defines': ['OS_CHROMEOS=1'],
799 }], 803 }],
800 ['touchui==1', { 804 ['touchui==1', {
801 'defines': ['TOUCH_UI=1'], 805 'defines': ['TOUCH_UI=1'],
802 }], 806 }],
807 ['use_xi2_1==1', {
808 'defines': ['USE_XI2_1=1'],
809 }],
803 ['use_wayland==1', { 810 ['use_wayland==1', {
804 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'], 811 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
805 }], 812 }],
806 ['file_manager_extension==1', { 813 ['file_manager_extension==1', {
807 'defines': ['FILE_MANAGER_EXTENSION=1'], 814 'defines': ['FILE_MANAGER_EXTENSION=1'],
808 }], 815 }],
809 ['webui_task_manager==1', { 816 ['webui_task_manager==1', {
810 'defines': ['WEBUI_TASK_MANAGER=1'], 817 'defines': ['WEBUI_TASK_MANAGER=1'],
811 }], 818 }],
812 ['profiling==1', { 819 ['profiling==1', {
(...skipping 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 # settings in target dicts. SYMROOT is a special case, because many other 2049 # settings in target dicts. SYMROOT is a special case, because many other
2043 # Xcode variables depend on it, including variables such as 2050 # Xcode variables depend on it, including variables such as
2044 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2051 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2045 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2052 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2046 # files to appear (when present) in the UI as actual files and not red 2053 # files to appear (when present) in the UI as actual files and not red
2047 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2054 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2048 # and therefore SYMROOT, needs to be set at the project level. 2055 # and therefore SYMROOT, needs to be set at the project level.
2049 'SYMROOT': '<(DEPTH)/xcodebuild', 2056 'SYMROOT': '<(DEPTH)/xcodebuild',
2050 }, 2057 },
2051 } 2058 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698