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

Side by Side Diff: build/common.gypi

Issue 7537045: Revert 95015 - WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/browser/extensions/extension_processes_apitest.cc » ('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) 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 # build (0). 122 # build (0).
123 'inside_chromium_build%': 1, 123 'inside_chromium_build%': 1,
124 124
125 # Set to 1 to enable fast builds. It disables debug info for fastest 125 # Set to 1 to enable fast builds. It disables debug info for fastest
126 # compilation. 126 # compilation.
127 'fastbuild%': 0, 127 'fastbuild%': 0,
128 128
129 # Disable file manager component extension by default. 129 # Disable file manager component extension by default.
130 'file_manager_extension%': 0, 130 'file_manager_extension%': 0,
131 131
132 # Disable WebUI TaskManager by default.
133 'webui_task_manager%': 0,
134
135 # Python version. 132 # Python version.
136 'python_ver%': '2.6', 133 'python_ver%': '2.6',
137 134
138 # Set ARM-v7 compilation flags 135 # Set ARM-v7 compilation flags
139 'armv7%': 0, 136 'armv7%': 0,
140 137
141 # Set Neon compilation flags (only meaningful if armv7==1). 138 # Set Neon compilation flags (only meaningful if armv7==1).
142 'arm_neon%': 1, 139 'arm_neon%': 1,
143 140
144 # The system root for cross-compiles. Default: none. 141 # The system root for cross-compiles. Default: none.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 'enable_flapper_hacks%': 0, 245 'enable_flapper_hacks%': 0,
249 }], 246 }],
250 247
251 # Enable file manager extension by default on Chrome OS. 248 # Enable file manager extension by default on Chrome OS.
252 ['chromeos==1', { 249 ['chromeos==1', {
253 'file_manager_extension%': 1, 250 'file_manager_extension%': 1,
254 }, { 251 }, {
255 'file_manager_extension%': 0, 252 'file_manager_extension%': 0,
256 }], 253 }],
257 254
258 # Enable WebUI TaskManager only on Chrome OS and Touch UI.
259 ['chromeos==1 or touchui==1', {
260 'webui_task_manager%': 1,
261 }, {
262 'webui_task_manager%': 0,
263 }],
264
265 # Enable smooth scrolling for Linux and ChromeOS 255 # Enable smooth scrolling for Linux and ChromeOS
266 ['OS=="linux"', { 256 ['OS=="linux"', {
267 'enable_smooth_scrolling%': 1, 257 'enable_smooth_scrolling%': 1,
268 }, { 258 }, {
269 'enable_smooth_scrolling%': 0, 259 'enable_smooth_scrolling%': 0,
270 }], 260 }],
271 ], 261 ],
272 }, 262 },
273 263
274 # Copy conditionally-set variables out one scope. 264 # Copy conditionally-set variables out one scope.
275 'branding%': '<(branding)', 265 'branding%': '<(branding)',
276 'buildtype%': '<(buildtype)', 266 'buildtype%': '<(buildtype)',
277 'target_arch%': '<(target_arch)', 267 'target_arch%': '<(target_arch)',
278 'host_arch%': '<(host_arch)', 268 'host_arch%': '<(host_arch)',
279 'library%': 'static_library', 269 'library%': 'static_library',
280 'toolkit_views%': '<(toolkit_views)', 270 'toolkit_views%': '<(toolkit_views)',
281 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 271 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
282 'views_compositor%': '<(views_compositor)', 272 'views_compositor%': '<(views_compositor)',
283 'os_posix%': '<(os_posix)', 273 'os_posix%': '<(os_posix)',
284 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 274 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
285 'use_skia%': '<(use_skia)', 275 'use_skia%': '<(use_skia)',
286 'use_x11%': '<(use_x11)', 276 'use_x11%': '<(use_x11)',
287 'use_gnome_keyring%': '<(use_gnome_keyring)', 277 'use_gnome_keyring%': '<(use_gnome_keyring)',
288 'linux_fpic%': '<(linux_fpic)', 278 'linux_fpic%': '<(linux_fpic)',
289 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 279 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
290 'chromeos%': '<(chromeos)', 280 'chromeos%': '<(chromeos)',
291 'touchui%': '<(touchui)', 281 'touchui%': '<(touchui)',
292 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 282 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
293 'file_manager_extension%': '<(file_manager_extension)', 283 'file_manager_extension%': '<(file_manager_extension)',
294 'webui_task_manager%': '<(webui_task_manager)',
295 'inside_chromium_build%': '<(inside_chromium_build)', 284 'inside_chromium_build%': '<(inside_chromium_build)',
296 'fastbuild%': '<(fastbuild)', 285 'fastbuild%': '<(fastbuild)',
297 'python_ver%': '<(python_ver)', 286 'python_ver%': '<(python_ver)',
298 'armv7%': '<(armv7)', 287 'armv7%': '<(armv7)',
299 'arm_neon%': '<(arm_neon)', 288 'arm_neon%': '<(arm_neon)',
300 'sysroot%': '<(sysroot)', 289 'sysroot%': '<(sysroot)',
301 'disable_sse2%': '<(disable_sse2)', 290 'disable_sse2%': '<(disable_sse2)',
302 'component%': '<(component)', 291 'component%': '<(component)',
303 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 292 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
304 'use_third_party_translations%': '<(use_third_party_translations)', 293 'use_third_party_translations%': '<(use_third_party_translations)',
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 }], 632 }],
644 ['touchui==1', { 633 ['touchui==1', {
645 'grit_defines': ['-D', 'touchui'], 634 'grit_defines': ['-D', 'touchui'],
646 }], 635 }],
647 ['webui_certificate_viewer==1', { 636 ['webui_certificate_viewer==1', {
648 'grit_defines': ['-D', 'webui_certificate_viewer'], 637 'grit_defines': ['-D', 'webui_certificate_viewer'],
649 }], 638 }],
650 ['file_manager_extension==1', { 639 ['file_manager_extension==1', {
651 'grit_defines': ['-D', 'file_manager_extension'], 640 'grit_defines': ['-D', 'file_manager_extension'],
652 }], 641 }],
653 ['webui_task_manager==1', {
654 'grit_defines': ['-D', 'webui_task_manager'],
655 }],
656 ['remoting==1', { 642 ['remoting==1', {
657 'grit_defines': ['-D', 'remoting'], 643 'grit_defines': ['-D', 'remoting'],
658 }], 644 }],
659 ['use_titlecase_in_grd_files==1', { 645 ['use_titlecase_in_grd_files==1', {
660 'grit_defines': ['-D', 'use_titlecase'], 646 'grit_defines': ['-D', 'use_titlecase'],
661 }], 647 }],
662 ['use_third_party_translations==1', { 648 ['use_third_party_translations==1', {
663 'grit_defines': ['-D', 'use_third_party_translations'], 649 'grit_defines': ['-D', 'use_third_party_translations'],
664 'locales': [ 650 'locales': [
665 'ast', 'bs', 'ca@valencia', 'eo', 'eu', 'gl', 'hy', 'ia', 'ka', 'ku', 651 'ast', 'bs', 'ca@valencia', 'eo', 'eu', 'gl', 'hy', 'ia', 'ka', 'ku',
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 }], 740 }],
755 ['touchui==1', { 741 ['touchui==1', {
756 'defines': ['TOUCH_UI=1'], 742 'defines': ['TOUCH_UI=1'],
757 }], 743 }],
758 ['use_wayland==1', { 744 ['use_wayland==1', {
759 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'], 745 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
760 }], 746 }],
761 ['file_manager_extension==1', { 747 ['file_manager_extension==1', {
762 'defines': ['FILE_MANAGER_EXTENSION=1'], 748 'defines': ['FILE_MANAGER_EXTENSION=1'],
763 }], 749 }],
764 ['webui_task_manager==1', {
765 'defines': ['WEBUI_TASK_MANAGER=1'],
766 }],
767 ['profiling==1', { 750 ['profiling==1', {
768 'defines': ['ENABLE_PROFILING=1'], 751 'defines': ['ENABLE_PROFILING=1'],
769 }], 752 }],
770 ['remoting==1', { 753 ['remoting==1', {
771 'defines': ['ENABLE_REMOTING=1'], 754 'defines': ['ENABLE_REMOTING=1'],
772 }], 755 }],
773 ['p2p_apis==1', { 756 ['p2p_apis==1', {
774 'defines': ['ENABLE_P2P_APIS=1'], 757 'defines': ['ENABLE_P2P_APIS=1'],
775 }], 758 }],
776 ['proprietary_codecs==1', { 759 ['proprietary_codecs==1', {
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 # settings in target dicts. SYMROOT is a special case, because many other 1912 # settings in target dicts. SYMROOT is a special case, because many other
1930 # Xcode variables depend on it, including variables such as 1913 # Xcode variables depend on it, including variables such as
1931 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1914 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1932 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1915 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1933 # files to appear (when present) in the UI as actual files and not red 1916 # files to appear (when present) in the UI as actual files and not red
1934 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1917 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1935 # and therefore SYMROOT, needs to be set at the project level. 1918 # and therefore SYMROOT, needs to be set at the project level.
1936 'SYMROOT': '<(DEPTH)/xcodebuild', 1919 'SYMROOT': '<(DEPTH)/xcodebuild',
1937 }, 1920 },
1938 } 1921 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_processes_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698