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

Side by Side Diff: build/common.gypi

Issue 11896029: Remove use_ibus variable from gyp file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « ash/ash.gyp ('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) 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 20 matching lines...) Expand all
31 'chromeos%': '<(chromeos)', 31 'chromeos%': '<(chromeos)',
32 'use_aura%': '<(use_aura)', 32 'use_aura%': '<(use_aura)',
33 'use_ash%': '<(use_ash)', 33 'use_ash%': '<(use_ash)',
34 34
35 # Whether we are using Views Toolkit 35 # Whether we are using Views Toolkit
36 'toolkit_views%': 0, 36 'toolkit_views%': 0,
37 37
38 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 38 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
39 'use_openssl%': 0, 39 'use_openssl%': 0,
40 40
41 'use_ibus%': 0,
42
43 # Disable viewport meta tag by default. 41 # Disable viewport meta tag by default.
44 'enable_viewport%': 0, 42 'enable_viewport%': 0,
45 43
46 # Enable HiDPI support. 44 # Enable HiDPI support.
47 'enable_hidpi%': 0, 45 'enable_hidpi%': 0,
48 46
49 # Enable touch optimized art assets and metrics. 47 # Enable touch optimized art assets and metrics.
50 'enable_touch_ui%': 0, 48 'enable_touch_ui%': 0,
51 49
52 # Override buildtype to select the desired build flavor. 50 # Override buildtype to select the desired build flavor.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'host_arch%': 85 'host_arch%':
88 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")', 86 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")',
89 }], 87 }],
90 ], 88 ],
91 }, 89 },
92 # Copy conditionally-set variables out one scope. 90 # Copy conditionally-set variables out one scope.
93 'chromeos%': '<(chromeos)', 91 'chromeos%': '<(chromeos)',
94 'use_aura%': '<(use_aura)', 92 'use_aura%': '<(use_aura)',
95 'use_ash%': '<(use_ash)', 93 'use_ash%': '<(use_ash)',
96 'use_openssl%': '<(use_openssl)', 94 'use_openssl%': '<(use_openssl)',
97 'use_ibus%': '<(use_ibus)',
98 'enable_viewport%': '<(enable_viewport)', 95 'enable_viewport%': '<(enable_viewport)',
99 'enable_hidpi%': '<(enable_hidpi)', 96 'enable_hidpi%': '<(enable_hidpi)',
100 'enable_touch_ui%': '<(enable_touch_ui)', 97 'enable_touch_ui%': '<(enable_touch_ui)',
101 'buildtype%': '<(buildtype)', 98 'buildtype%': '<(buildtype)',
102 'host_arch%': '<(host_arch)', 99 'host_arch%': '<(host_arch)',
103 100
104 # Default architecture we're building for is the architecture we're 101 # Default architecture we're building for is the architecture we're
105 # building on. 102 # building on.
106 'target_arch%': '<(host_arch)', 103 'target_arch%': '<(host_arch)',
107 104
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 156
160 # Copy conditionally-set variables out one scope. 157 # Copy conditionally-set variables out one scope.
161 'chromeos%': '<(chromeos)', 158 'chromeos%': '<(chromeos)',
162 'host_arch%': '<(host_arch)', 159 'host_arch%': '<(host_arch)',
163 'target_arch%': '<(target_arch)', 160 'target_arch%': '<(target_arch)',
164 'toolkit_views%': '<(toolkit_views)', 161 'toolkit_views%': '<(toolkit_views)',
165 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 162 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
166 'use_aura%': '<(use_aura)', 163 'use_aura%': '<(use_aura)',
167 'use_ash%': '<(use_ash)', 164 'use_ash%': '<(use_ash)',
168 'use_openssl%': '<(use_openssl)', 165 'use_openssl%': '<(use_openssl)',
169 'use_ibus%': '<(use_ibus)',
170 'enable_viewport%': '<(enable_viewport)', 166 'enable_viewport%': '<(enable_viewport)',
171 'enable_hidpi%': '<(enable_hidpi)', 167 'enable_hidpi%': '<(enable_hidpi)',
172 'enable_touch_ui%': '<(enable_touch_ui)', 168 'enable_touch_ui%': '<(enable_touch_ui)',
173 'android_build_type%': '<(android_build_type)', 169 'android_build_type%': '<(android_build_type)',
174 'enable_app_list%': '<(enable_app_list)', 170 'enable_app_list%': '<(enable_app_list)',
175 'enable_message_center%': '<(enable_message_center)', 171 'enable_message_center%': '<(enable_message_center)',
176 'use_default_render_theme%': '<(use_default_render_theme)', 172 'use_default_render_theme%': '<(use_default_render_theme)',
177 'buildtype%': '<(buildtype)', 173 'buildtype%': '<(buildtype)',
178 174
179 # We used to provide a variable for changing how libraries were built. 175 # We used to provide a variable for changing how libraries were built.
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 'branding%': '<(branding)', 654 'branding%': '<(branding)',
659 'buildtype%': '<(buildtype)', 655 'buildtype%': '<(buildtype)',
660 'target_arch%': '<(target_arch)', 656 'target_arch%': '<(target_arch)',
661 'host_arch%': '<(host_arch)', 657 'host_arch%': '<(host_arch)',
662 'library%': 'static_library', 658 'library%': 'static_library',
663 'toolkit_views%': '<(toolkit_views)', 659 'toolkit_views%': '<(toolkit_views)',
664 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 660 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
665 'use_aura%': '<(use_aura)', 661 'use_aura%': '<(use_aura)',
666 'use_ash%': '<(use_ash)', 662 'use_ash%': '<(use_ash)',
667 'use_openssl%': '<(use_openssl)', 663 'use_openssl%': '<(use_openssl)',
668 'use_ibus%': '<(use_ibus)',
669 'use_nss%': '<(use_nss)', 664 'use_nss%': '<(use_nss)',
670 'os_bsd%': '<(os_bsd)', 665 'os_bsd%': '<(os_bsd)',
671 'os_posix%': '<(os_posix)', 666 'os_posix%': '<(os_posix)',
672 'use_glib%': '<(use_glib)', 667 'use_glib%': '<(use_glib)',
673 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 668 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
674 'use_skia%': '<(use_skia)', 669 'use_skia%': '<(use_skia)',
675 'use_x11%': '<(use_x11)', 670 'use_x11%': '<(use_x11)',
676 'use_gnome_keyring%': '<(use_gnome_keyring)', 671 'use_gnome_keyring%': '<(use_gnome_keyring)',
677 'linux_fpic%': '<(linux_fpic)', 672 'linux_fpic%': '<(linux_fpic)',
678 'enable_pepper_threading%': '<(enable_pepper_threading)', 673 'enable_pepper_threading%': '<(enable_pepper_threading)',
(...skipping 3315 matching lines...) Expand 10 before | Expand all | Expand 10 after
3994 # settings in target dicts. SYMROOT is a special case, because many other 3989 # settings in target dicts. SYMROOT is a special case, because many other
3995 # Xcode variables depend on it, including variables such as 3990 # Xcode variables depend on it, including variables such as
3996 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3991 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3997 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3992 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3998 # files to appear (when present) in the UI as actual files and not red 3993 # files to appear (when present) in the UI as actual files and not red
3999 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3994 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4000 # and therefore SYMROOT, needs to be set at the project level. 3995 # and therefore SYMROOT, needs to be set at the project level.
4001 'SYMROOT': '<(DEPTH)/xcodebuild', 3996 'SYMROOT': '<(DEPTH)/xcodebuild',
4002 }, 3997 },
4003 } 3998 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698