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

Side by Side Diff: build/common.gypi

Issue 9701006: Don't build the task manager into Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve jam's commnents about not ifdef'ing includes Created 8 years, 8 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/net/chrome_network_delegate.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) 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 # PPAPI by default does not support plugins making calls off the main 228 # PPAPI by default does not support plugins making calls off the main
229 # thread. Set to 1 to turn on experimental support for out-of-process 229 # thread. Set to 1 to turn on experimental support for out-of-process
230 # plugins to make call of the main thread. 230 # plugins to make call of the main thread.
231 'enable_pepper_threading%': 0, 231 'enable_pepper_threading%': 0,
232 232
233 # Enables theme support, which is enabled by default. Support for 233 # Enables theme support, which is enabled by default. Support for
234 # disabling depends on the platform. 234 # disabling depends on the platform.
235 'enable_themes%': 1, 235 'enable_themes%': 1,
236 236
237 # Enable the task manager by default.
238 'enable_task_manager%': 1,
239
237 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 240 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
238 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, 241 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
239 # the input value also defines the required XI2 minor minimum version. 242 # the input value also defines the required XI2 minor minimum version.
240 # For example, use_xi2_mt=2 means XI2.2 or above version is required. 243 # For example, use_xi2_mt=2 means XI2.2 or above version is required.
241 'use_xi2_mt%': 0, 244 'use_xi2_mt%': 0,
242 245
243 # Use of precompiled headers on Windows. 246 # Use of precompiled headers on Windows.
244 # 247 #
245 # This is on by default in VS 2010, but off by default for VS 248 # This is on by default in VS 2010, but off by default for VS
246 # 2008 because of complications that it can cause with our 249 # 2008 because of complications that it can cause with our
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 500 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
498 'enable_plugin_installation%': '<(enable_plugin_installation)', 501 'enable_plugin_installation%': '<(enable_plugin_installation)',
499 'enable_protector_service%': '<(enable_protector_service)', 502 'enable_protector_service%': '<(enable_protector_service)',
500 'enable_themes%': '<(enable_themes)', 503 'enable_themes%': '<(enable_themes)',
501 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 504 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
502 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 505 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
503 'use_canvas_skia%': '<(use_canvas_skia)', 506 'use_canvas_skia%': '<(use_canvas_skia)',
504 'tests_run%': '<(tests_run)', 507 'tests_run%': '<(tests_run)',
505 'enable_automation%': '<(enable_automation)', 508 'enable_automation%': '<(enable_automation)',
506 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 509 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
510 'enable_task_manager%': '<(enable_task_manager)',
507 511
508 # Whether to build for Wayland display server 512 # Whether to build for Wayland display server
509 'use_wayland%': 0, 513 'use_wayland%': 0,
510 514
511 # Use system yasm instead of bundled one. 515 # Use system yasm instead of bundled one.
512 'use_system_yasm%': 0, 516 'use_system_yasm%': 0,
513 517
514 # Default to enabled PIE; this is important for ASLR but we may need to be 518 # Default to enabled PIE; this is important for ASLR but we may need to be
515 # able to turn it off for various reasons. 519 # able to turn it off for various reasons.
516 'linux_disable_pie%': 0, 520 'linux_disable_pie%': 0,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 781 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
778 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', 782 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
779 783
780 # Uses Android's crash report system 784 # Uses Android's crash report system
781 'linux_breakpad%': 0, 785 'linux_breakpad%': 0,
782 786
783 # Always uses openssl. 787 # Always uses openssl.
784 'use_openssl%': 1, 788 'use_openssl%': 1,
785 789
786 'proprietary_codecs%': '<(proprietary_codecs)', 790 'proprietary_codecs%': '<(proprietary_codecs)',
791 'enable_task_manager%': 0,
787 'safe_browsing%': 0, 792 'safe_browsing%': 0,
788 'configuration_policy%': 0, 793 'configuration_policy%': 0,
789 'input_speech%': 0, 794 'input_speech%': 0,
790 'enable_web_intents%': 0, 795 'enable_web_intents%': 0,
791 'java_bridge%': 1, 796 'java_bridge%': 1,
792 # Android does not support themes. 797 # Android does not support themes.
793 'enable_themes%': 0, 798 'enable_themes%': 0,
794 799
795 # Set to 1 once we have a notification system for Android. 800 # Set to 1 once we have a notification system for Android.
796 # http://crbug.com/115320 801 # http://crbug.com/115320
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 ], 1353 ],
1349 'include_dirs': [ 1354 'include_dirs': [
1350 '<(DEPTH)/third_party/wtl/include', 1355 '<(DEPTH)/third_party/wtl/include',
1351 ], 1356 ],
1352 }], # OS==win 1357 }], # OS==win
1353 ['enable_register_protocol_handler==1', { 1358 ['enable_register_protocol_handler==1', {
1354 'defines': [ 1359 'defines': [
1355 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 1360 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
1356 ], 1361 ],
1357 }], 1362 }],
1363 ['enable_task_manager==1', {
1364 'defines': [
1365 'ENABLE_TASK_MANAGER=1',
1366 ],
1367 }],
1358 ['enable_web_intents==1', { 1368 ['enable_web_intents==1', {
1359 'defines': [ 1369 'defines': [
1360 'ENABLE_WEB_INTENTS=1', 1370 'ENABLE_WEB_INTENTS=1',
1361 ], 1371 ],
1362 }], 1372 }],
1363 ['OS=="win" and branding=="Chrome"', { 1373 ['OS=="win" and branding=="Chrome"', {
1364 'defines': ['ENABLE_SWIFTSHADER'], 1374 'defines': ['ENABLE_SWIFTSHADER'],
1365 }], 1375 }],
1366 ['enable_dart==1', { 1376 ['enable_dart==1', {
1367 'defines': ['WEBKIT_USING_DART=1'], 1377 'defines': ['WEBKIT_USING_DART=1'],
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2957 # settings in target dicts. SYMROOT is a special case, because many other 2967 # settings in target dicts. SYMROOT is a special case, because many other
2958 # Xcode variables depend on it, including variables such as 2968 # Xcode variables depend on it, including variables such as
2959 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2969 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2960 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2970 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2961 # files to appear (when present) in the UI as actual files and not red 2971 # files to appear (when present) in the UI as actual files and not red
2962 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2972 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2963 # and therefore SYMROOT, needs to be set at the project level. 2973 # and therefore SYMROOT, needs to be set at the project level.
2964 'SYMROOT': '<(DEPTH)/xcodebuild', 2974 'SYMROOT': '<(DEPTH)/xcodebuild',
2965 }, 2975 },
2966 } 2976 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698