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

Side by Side Diff: build/common.gypi

Issue 165803003: Remove enable_touch_ui variable from build/common.gypi. No longer used. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 10 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 50 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
51 'use_openssl%': 0, 51 'use_openssl%': 0,
52 52
53 # Disable viewport meta tag by default. 53 # Disable viewport meta tag by default.
54 'enable_viewport%': 0, 54 'enable_viewport%': 0,
55 55
56 # Enable HiDPI support. 56 # Enable HiDPI support.
57 'enable_hidpi%': 0, 57 'enable_hidpi%': 0,
58 58
59 # Enable touch optimized art assets and metrics.
60 'enable_touch_ui%': 0,
61
62 # Override buildtype to select the desired build flavor. 59 # Override buildtype to select the desired build flavor.
63 # Dev - everyday build for development/testing 60 # Dev - everyday build for development/testing
64 # Official - release build (generally implies additional processing) 61 # Official - release build (generally implies additional processing)
65 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp 62 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
66 # conversion is done), some of the things which are now controlled by 63 # conversion is done), some of the things which are now controlled by
67 # 'branding', such as symbol generation, will need to be refactored 64 # 'branding', such as symbol generation, will need to be refactored
68 # based on 'buildtype' (i.e. we don't care about saving symbols for 65 # based on 'buildtype' (i.e. we don't care about saving symbols for
69 # non-Official # builds). 66 # non-Official # builds).
70 'buildtype%': 'Dev', 67 'buildtype%': 'Dev',
71 68
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 'desktop_linux%': '<(desktop_linux)', 120 'desktop_linux%': '<(desktop_linux)',
124 'use_aura%': '<(use_aura)', 121 'use_aura%': '<(use_aura)',
125 'use_ash%': '<(use_ash)', 122 'use_ash%': '<(use_ash)',
126 'use_cras%': '<(use_cras)', 123 'use_cras%': '<(use_cras)',
127 'use_ozone%': '<(use_ozone)', 124 'use_ozone%': '<(use_ozone)',
128 'embedded%': '<(embedded)', 125 'embedded%': '<(embedded)',
129 'use_openssl%': '<(use_openssl)', 126 'use_openssl%': '<(use_openssl)',
130 'use_system_fontconfig%': '<(use_system_fontconfig)', 127 'use_system_fontconfig%': '<(use_system_fontconfig)',
131 'enable_viewport%': '<(enable_viewport)', 128 'enable_viewport%': '<(enable_viewport)',
132 'enable_hidpi%': '<(enable_hidpi)', 129 'enable_hidpi%': '<(enable_hidpi)',
133 'enable_touch_ui%': '<(enable_touch_ui)',
134 'buildtype%': '<(buildtype)', 130 'buildtype%': '<(buildtype)',
135 'branding%': '<(branding)', 131 'branding%': '<(branding)',
136 'host_arch%': '<(host_arch)', 132 'host_arch%': '<(host_arch)',
137 133
138 # Default architecture we're building for is the architecture we're 134 # Default architecture we're building for is the architecture we're
139 # building on, and possibly sub-architecture (for iOS builds). 135 # building on, and possibly sub-architecture (for iOS builds).
140 'target_arch%': '<(host_arch)', 136 'target_arch%': '<(host_arch)',
141 'target_subarch%': '', 137 'target_subarch%': '',
142 138
143 # This is set when building the Android WebView inside the Android 139 # This is set when building the Android WebView inside the Android
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 'toolkit_uses_gtk%': 1, 179 'toolkit_uses_gtk%': 1,
184 }, { 180 }, {
185 'toolkit_uses_gtk%': 0, 181 'toolkit_uses_gtk%': 0,
186 }], 182 }],
187 183
188 # Enable HiDPI on Mac OS and Chrome OS. 184 # Enable HiDPI on Mac OS and Chrome OS.
189 ['OS=="mac" or chromeos==1', { 185 ['OS=="mac" or chromeos==1', {
190 'enable_hidpi%': 1, 186 'enable_hidpi%': 1,
191 }], 187 }],
192 188
193 # Enable touch UI on Metro.
194 ['OS=="win"', {
195 'enable_touch_ui%': 1,
196 }],
197
198 # Enable App Launcher on ChromeOS, Windows and OSX. 189 # Enable App Launcher on ChromeOS, Windows and OSX.
199 # On Linux, enable App Launcher for the Aura build. 190 # On Linux, enable App Launcher for the Aura build.
200 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au ra==1)', { 191 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au ra==1)', {
201 'enable_app_list%': 1, 192 'enable_app_list%': 1,
202 }, { 193 }, {
203 'enable_app_list%': 0, 194 'enable_app_list%': 0,
204 }], 195 }],
205 196
206 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { 197 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', {
207 'use_default_render_theme%': 1, 198 'use_default_render_theme%': 1,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 'use_ash%': '<(use_ash)', 239 'use_ash%': '<(use_ash)',
249 'use_cras%': '<(use_cras)', 240 'use_cras%': '<(use_cras)',
250 'use_ozone%': '<(use_ozone)', 241 'use_ozone%': '<(use_ozone)',
251 'use_ozone_evdev%': '<(use_ozone_evdev)', 242 'use_ozone_evdev%': '<(use_ozone_evdev)',
252 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 243 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
253 'embedded%': '<(embedded)', 244 'embedded%': '<(embedded)',
254 'use_openssl%': '<(use_openssl)', 245 'use_openssl%': '<(use_openssl)',
255 'use_system_fontconfig%': '<(use_system_fontconfig)', 246 'use_system_fontconfig%': '<(use_system_fontconfig)',
256 'enable_viewport%': '<(enable_viewport)', 247 'enable_viewport%': '<(enable_viewport)',
257 'enable_hidpi%': '<(enable_hidpi)', 248 'enable_hidpi%': '<(enable_hidpi)',
258 'enable_touch_ui%': '<(enable_touch_ui)',
259 'android_webview_build%': '<(android_webview_build)', 249 'android_webview_build%': '<(android_webview_build)',
260 'use_goma%': '<(use_goma)', 250 'use_goma%': '<(use_goma)',
261 'gomadir%': '<(gomadir)', 251 'gomadir%': '<(gomadir)',
262 'enable_app_list%': '<(enable_app_list)', 252 'enable_app_list%': '<(enable_app_list)',
263 'use_default_render_theme%': '<(use_default_render_theme)', 253 'use_default_render_theme%': '<(use_default_render_theme)',
264 'buildtype%': '<(buildtype)', 254 'buildtype%': '<(buildtype)',
265 'branding%': '<(branding)', 255 'branding%': '<(branding)',
266 'arm_version%': '<(arm_version)', 256 'arm_version%': '<(arm_version)',
267 257
268 # Set to 1 to enable fast builds. Set to 2 for even faster builds 258 # Set to 1 to enable fast builds. Set to 2 for even faster builds
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 894 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
905 'use_system_fontconfig%': '<(use_system_fontconfig)', 895 'use_system_fontconfig%': '<(use_system_fontconfig)',
906 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 896 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
907 'desktop_linux%': '<(desktop_linux)', 897 'desktop_linux%': '<(desktop_linux)',
908 'use_x11%': '<(use_x11)', 898 'use_x11%': '<(use_x11)',
909 'use_gnome_keyring%': '<(use_gnome_keyring)', 899 'use_gnome_keyring%': '<(use_gnome_keyring)',
910 'linux_fpic%': '<(linux_fpic)', 900 'linux_fpic%': '<(linux_fpic)',
911 'chromeos%': '<(chromeos)', 901 'chromeos%': '<(chromeos)',
912 'enable_viewport%': '<(enable_viewport)', 902 'enable_viewport%': '<(enable_viewport)',
913 'enable_hidpi%': '<(enable_hidpi)', 903 'enable_hidpi%': '<(enable_hidpi)',
914 'enable_touch_ui%': '<(enable_touch_ui)',
915 'use_xi2_mt%':'<(use_xi2_mt)', 904 'use_xi2_mt%':'<(use_xi2_mt)',
916 'image_loader_extension%': '<(image_loader_extension)', 905 'image_loader_extension%': '<(image_loader_extension)',
917 'fastbuild%': '<(fastbuild)', 906 'fastbuild%': '<(fastbuild)',
918 'dcheck_always_on%': '<(dcheck_always_on)', 907 'dcheck_always_on%': '<(dcheck_always_on)',
919 'logging_like_official_build%': '<(logging_like_official_build)', 908 'logging_like_official_build%': '<(logging_like_official_build)',
920 'tracing_like_official_build%': '<(tracing_like_official_build)', 909 'tracing_like_official_build%': '<(tracing_like_official_build)',
921 'python_ver%': '<(python_ver)', 910 'python_ver%': '<(python_ver)',
922 'arm_version%': '<(arm_version)', 911 'arm_version%': '<(arm_version)',
923 'arm_neon%': '<(arm_neon)', 912 'arm_neon%': '<(arm_neon)',
924 'arm_neon_optional%': '<(arm_neon_optional)', 913 'arm_neon_optional%': '<(arm_neon_optional)',
(...skipping 4054 matching lines...) Expand 10 before | Expand all | Expand 10 after
4979 # settings in target dicts. SYMROOT is a special case, because many other 4968 # settings in target dicts. SYMROOT is a special case, because many other
4980 # Xcode variables depend on it, including variables such as 4969 # Xcode variables depend on it, including variables such as
4981 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4970 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4982 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4971 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4983 # files to appear (when present) in the UI as actual files and not red 4972 # files to appear (when present) in the UI as actual files and not red
4984 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4973 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4985 # and therefore SYMROOT, needs to be set at the project level. 4974 # and therefore SYMROOT, needs to be set at the project level.
4986 'SYMROOT': '<(DEPTH)/xcodebuild', 4975 'SYMROOT': '<(DEPTH)/xcodebuild',
4987 }, 4976 },
4988 } 4977 }
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