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

Side by Side Diff: build/common.gypi

Issue 10399046: Remove virtual keyboard support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 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 | « no previous file | chrome/app/generated_resources.grd » ('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) 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 14 matching lines...) Expand all
25 25
26 # Whether or not we are using the Aura windowing framework. 26 # Whether or not we are using the Aura windowing framework.
27 'use_aura%': 0, 27 'use_aura%': 0,
28 28
29 # Whether or not we are building the Ash shell. 29 # Whether or not we are building the Ash shell.
30 'use_ash%': 0, 30 'use_ash%': 0,
31 31
32 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 32 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
33 'use_openssl%': 0, 33 'use_openssl%': 0,
34 34
35 # Disable Virtual keyboard support by default. 35 'use_ibus%': 0,
36 'use_virtual_keyboard%': 0,
37 36
38 # Disable viewport meta tag by default. 37 # Disable viewport meta tag by default.
39 'enable_viewport%': 0, 38 'enable_viewport%': 0,
40 39
41 # Enable HiDPI support. 40 # Enable HiDPI support.
42 'enable_hidpi%': 0, 41 'enable_hidpi%': 0,
43 42
44 # Enable touch optimized art assets and metrics. 43 # Enable touch optimized art assets and metrics.
45 'enable_touch_ui%': 0, 44 'enable_touch_ui%': 0,
46 45
(...skipping 14 matching lines...) Expand all
61 # 'branding', such as symbol generation, will need to be refactored 60 # 'branding', such as symbol generation, will need to be refactored
62 # based on 'buildtype' (i.e. we don't care about saving symbols for 61 # based on 'buildtype' (i.e. we don't care about saving symbols for
63 # non-Official # builds). 62 # non-Official # builds).
64 'buildtype%': 'Dev', 63 'buildtype%': 'Dev',
65 }, 64 },
66 # Copy conditionally-set variables out one scope. 65 # Copy conditionally-set variables out one scope.
67 'chromeos%': '<(chromeos)', 66 'chromeos%': '<(chromeos)',
68 'use_aura%': '<(use_aura)', 67 'use_aura%': '<(use_aura)',
69 'use_ash%': '<(use_ash)', 68 'use_ash%': '<(use_ash)',
70 'use_openssl%': '<(use_openssl)', 69 'use_openssl%': '<(use_openssl)',
71 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 70 'use_ibus%': '<(use_ibus)',
72 'enable_viewport%': '<(enable_viewport)', 71 'enable_viewport%': '<(enable_viewport)',
73 'enable_hidpi%': '<(enable_hidpi)', 72 'enable_hidpi%': '<(enable_hidpi)',
74 'enable_touch_ui%': '<(enable_touch_ui)', 73 'enable_touch_ui%': '<(enable_touch_ui)',
75 'enable_metro%': '<(enable_metro)', 74 'enable_metro%': '<(enable_metro)',
76 'android_upstream_bringup%': '<(android_upstream_bringup)', 75 'android_upstream_bringup%': '<(android_upstream_bringup)',
77 'buildtype%': '<(buildtype)', 76 'buildtype%': '<(buildtype)',
78 77
79 # Compute the architecture that we're building on. 78 # Compute the architecture that we're building on.
80 'conditions': [ 79 'conditions': [
81 [ 'OS=="win" or OS=="mac"', { 80 [ 'OS=="win" or OS=="mac"', {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 ], 123 ],
125 }, 124 },
126 125
127 # Copy conditionally-set variables out one scope. 126 # Copy conditionally-set variables out one scope.
128 'chromeos%': '<(chromeos)', 127 'chromeos%': '<(chromeos)',
129 'host_arch%': '<(host_arch)', 128 'host_arch%': '<(host_arch)',
130 'toolkit_views%': '<(toolkit_views)', 129 'toolkit_views%': '<(toolkit_views)',
131 'use_aura%': '<(use_aura)', 130 'use_aura%': '<(use_aura)',
132 'use_ash%': '<(use_ash)', 131 'use_ash%': '<(use_ash)',
133 'use_openssl%': '<(use_openssl)', 132 'use_openssl%': '<(use_openssl)',
134 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 133 'use_ibus%': '<(use_ibus)',
135 'enable_viewport%': '<(enable_viewport)', 134 'enable_viewport%': '<(enable_viewport)',
136 'enable_hidpi%': '<(enable_hidpi)', 135 'enable_hidpi%': '<(enable_hidpi)',
137 'enable_touch_ui%': '<(enable_touch_ui)', 136 'enable_touch_ui%': '<(enable_touch_ui)',
138 'enable_metro%': '<(enable_metro)', 137 'enable_metro%': '<(enable_metro)',
139 'android_upstream_bringup%': '<(android_upstream_bringup)', 138 'android_upstream_bringup%': '<(android_upstream_bringup)',
140 139
141 # We used to provide a variable for changing how libraries were built. 140 # We used to provide a variable for changing how libraries were built.
142 # This variable remains until we can clean up all the users. 141 # This variable remains until we can clean up all the users.
143 # This needs to be one nested variables dict in so that dependent 142 # This needs to be one nested variables dict in so that dependent
144 # gyp files can make use of it in their outer variables. (Yikes!) 143 # gyp files can make use of it in their outer variables. (Yikes!)
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 'branding%': '<(branding)', 509 'branding%': '<(branding)',
511 'buildtype%': '<(buildtype)', 510 'buildtype%': '<(buildtype)',
512 'target_arch%': '<(target_arch)', 511 'target_arch%': '<(target_arch)',
513 'host_arch%': '<(host_arch)', 512 'host_arch%': '<(host_arch)',
514 'library%': 'static_library', 513 'library%': 'static_library',
515 'toolkit_views%': '<(toolkit_views)', 514 'toolkit_views%': '<(toolkit_views)',
516 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 515 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
517 'use_aura%': '<(use_aura)', 516 'use_aura%': '<(use_aura)',
518 'use_ash%': '<(use_ash)', 517 'use_ash%': '<(use_ash)',
519 'use_openssl%': '<(use_openssl)', 518 'use_openssl%': '<(use_openssl)',
519 'use_ibus%': '<(use_ibus)',
520 'use_nss%': '<(use_nss)', 520 'use_nss%': '<(use_nss)',
521 'os_bsd%': '<(os_bsd)', 521 'os_bsd%': '<(os_bsd)',
522 'os_posix%': '<(os_posix)', 522 'os_posix%': '<(os_posix)',
523 'use_glib%': '<(use_glib)', 523 'use_glib%': '<(use_glib)',
524 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 524 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
525 'use_skia%': '<(use_skia)', 525 'use_skia%': '<(use_skia)',
526 'use_x11%': '<(use_x11)', 526 'use_x11%': '<(use_x11)',
527 'use_gnome_keyring%': '<(use_gnome_keyring)', 527 'use_gnome_keyring%': '<(use_gnome_keyring)',
528 'linux_fpic%': '<(linux_fpic)', 528 'linux_fpic%': '<(linux_fpic)',
529 'enable_pepper_threading%': '<(enable_pepper_threading)', 529 'enable_pepper_threading%': '<(enable_pepper_threading)',
530 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)', 530 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)',
531 'chromeos%': '<(chromeos)', 531 'chromeos%': '<(chromeos)',
532 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
533 'enable_viewport%': '<(enable_viewport)', 532 'enable_viewport%': '<(enable_viewport)',
534 'enable_hidpi%': '<(enable_hidpi)', 533 'enable_hidpi%': '<(enable_hidpi)',
535 'enable_touch_ui%': '<(enable_touch_ui)', 534 'enable_touch_ui%': '<(enable_touch_ui)',
536 'enable_metro%': '<(enable_metro)', 535 'enable_metro%': '<(enable_metro)',
537 'use_xi2_mt%':'<(use_xi2_mt)', 536 'use_xi2_mt%':'<(use_xi2_mt)',
538 'file_manager_extension%': '<(file_manager_extension)', 537 'file_manager_extension%': '<(file_manager_extension)',
539 'webui_task_manager%': '<(webui_task_manager)', 538 'webui_task_manager%': '<(webui_task_manager)',
540 'inside_chromium_build%': '<(inside_chromium_build)', 539 'inside_chromium_build%': '<(inside_chromium_build)',
541 'fastbuild%': '<(fastbuild)', 540 'fastbuild%': '<(fastbuild)',
542 'dcheck_always_on%': '<(dcheck_always_on)', 541 'dcheck_always_on%': '<(dcheck_always_on)',
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 }], 1052 }],
1054 ['use_aura==1', { 1053 ['use_aura==1', {
1055 'grit_defines': ['-D', 'use_aura'], 1054 'grit_defines': ['-D', 'use_aura'],
1056 }], 1055 }],
1057 ['use_ash==1', { 1056 ['use_ash==1', {
1058 'grit_defines': ['-D', 'use_ash'], 1057 'grit_defines': ['-D', 'use_ash'],
1059 }], 1058 }],
1060 ['use_nss==1', { 1059 ['use_nss==1', {
1061 'grit_defines': ['-D', 'use_nss'], 1060 'grit_defines': ['-D', 'use_nss'],
1062 }], 1061 }],
1063 ['use_virtual_keyboard==1', {
1064 'grit_defines': ['-D', 'use_virtual_keyboard'],
1065 }],
1066 ['file_manager_extension==1', { 1062 ['file_manager_extension==1', {
1067 'grit_defines': ['-D', 'file_manager_extension'], 1063 'grit_defines': ['-D', 'file_manager_extension'],
1068 }], 1064 }],
1069 ['webui_task_manager==1', { 1065 ['webui_task_manager==1', {
1070 'grit_defines': ['-D', 'webui_task_manager'], 1066 'grit_defines': ['-D', 'webui_task_manager'],
1071 }], 1067 }],
1072 ['remoting==1', { 1068 ['remoting==1', {
1073 'grit_defines': ['-D', 'remoting'], 1069 'grit_defines': ['-D', 'remoting'],
1074 }], 1070 }],
1075 ['use_titlecase_in_grd_files==1', { 1071 ['use_titlecase_in_grd_files==1', {
(...skipping 30 matching lines...) Expand all
1106 '-skip-refcounted-dtors' 1102 '-skip-refcounted-dtors'
1107 ], 1103 ],
1108 }, { 1104 }, {
1109 'clang_chrome_plugins_flags': [ 1105 'clang_chrome_plugins_flags': [
1110 '<@(clang_chrome_plugins_flags)', 1106 '<@(clang_chrome_plugins_flags)',
1111 ], 1107 ],
1112 }], 1108 }],
1113 ], 1109 ],
1114 }], 1110 }],
1115 1111
1116 # Set use_ibus to 1 to enable ibus support.
1117 ['use_virtual_keyboard==1 and chromeos==1', {
1118 'use_ibus%': 1,
1119 }, {
1120 'use_ibus%': 0,
1121 }],
1122
1123 ['enable_web_intents_tag==1', { 1112 ['enable_web_intents_tag==1', {
1124 'grit_defines': ['-D', 'enable_web_intents_tag'], 1113 'grit_defines': ['-D', 'enable_web_intents_tag'],
1125 }], 1114 }],
1126 1115
1127 ['asan==1', { 1116 ['asan==1', {
1128 'clang%': 1, 1117 'clang%': 1,
1129 # Do not use Chrome plugins for Clang. The Clang version in 1118 # Do not use Chrome plugins for Clang. The Clang version in
1130 # third_party/asan may be different from the default one. 1119 # third_party/asan may be different from the default one.
1131 'clang_use_chrome_plugins%': 0, 1120 'clang_use_chrome_plugins%': 0,
1132 }], 1121 }],
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1303 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 1292 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
1304 }], 1293 }],
1305 ['toolkit_uses_gtk==1 and toolkit_views==0', { 1294 ['toolkit_uses_gtk==1 and toolkit_views==0', {
1306 # TODO(erg): We are progressively sealing up use of deprecated features 1295 # TODO(erg): We are progressively sealing up use of deprecated features
1307 # in gtk in preparation for an eventual porting to gtk3. 1296 # in gtk in preparation for an eventual porting to gtk3.
1308 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 1297 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
1309 }], 1298 }],
1310 ['chromeos==1', { 1299 ['chromeos==1', {
1311 'defines': ['OS_CHROMEOS=1'], 1300 'defines': ['OS_CHROMEOS=1'],
1312 }], 1301 }],
1313 ['use_virtual_keyboard==1', {
1314 'defines': ['USE_VIRTUAL_KEYBOARD=1'],
1315 }],
1316 ['use_xi2_mt!=0', { 1302 ['use_xi2_mt!=0', {
1317 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], 1303 'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
1318 }], 1304 }],
1319 ['file_manager_extension==1', { 1305 ['file_manager_extension==1', {
1320 'defines': ['FILE_MANAGER_EXTENSION=1'], 1306 'defines': ['FILE_MANAGER_EXTENSION=1'],
1321 }], 1307 }],
1322 ['webui_task_manager==1', { 1308 ['webui_task_manager==1', {
1323 'defines': ['WEBUI_TASK_MANAGER=1'], 1309 'defines': ['WEBUI_TASK_MANAGER=1'],
1324 }], 1310 }],
1325 ['profiling==1', { 1311 ['profiling==1', {
(...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after
3117 # settings in target dicts. SYMROOT is a special case, because many other 3103 # settings in target dicts. SYMROOT is a special case, because many other
3118 # Xcode variables depend on it, including variables such as 3104 # Xcode variables depend on it, including variables such as
3119 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3105 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3120 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3106 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3121 # files to appear (when present) in the UI as actual files and not red 3107 # files to appear (when present) in the UI as actual files and not red
3122 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3108 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3123 # and therefore SYMROOT, needs to be set at the project level. 3109 # and therefore SYMROOT, needs to be set at the project level.
3124 'SYMROOT': '<(DEPTH)/xcodebuild', 3110 'SYMROOT': '<(DEPTH)/xcodebuild',
3125 }, 3111 },
3126 } 3112 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698