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

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 yfriedman's comments 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
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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 'enable_web_intents%': '<(enable_web_intents)', 490 'enable_web_intents%': '<(enable_web_intents)',
488 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 491 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
489 'enable_plugin_installation%': '<(enable_plugin_installation)', 492 'enable_plugin_installation%': '<(enable_plugin_installation)',
490 'enable_themes%': '<(enable_themes)', 493 'enable_themes%': '<(enable_themes)',
491 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 494 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
492 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 495 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
493 'use_canvas_skia%': '<(use_canvas_skia)', 496 'use_canvas_skia%': '<(use_canvas_skia)',
494 'tests_run%': '<(tests_run)', 497 'tests_run%': '<(tests_run)',
495 'enable_automation%': '<(enable_automation)', 498 'enable_automation%': '<(enable_automation)',
496 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 499 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
500 'enable_task_manager%': '<(enable_task_manager)',
497 501
498 # Whether to build for Wayland display server 502 # Whether to build for Wayland display server
499 'use_wayland%': 0, 503 'use_wayland%': 0,
500 504
501 # Use system yasm instead of bundled one. 505 # Use system yasm instead of bundled one.
502 'use_system_yasm%': 0, 506 'use_system_yasm%': 0,
503 507
504 # Default to enabled PIE; this is important for ASLR but we may need to be 508 # Default to enabled PIE; this is important for ASLR but we may need to be
505 # able to turn it off for various reasons. 509 # able to turn it off for various reasons.
506 'linux_disable_pie%': 0, 510 'linux_disable_pie%': 0,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 771 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
768 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', 772 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
769 773
770 # Uses Android's crash report system 774 # Uses Android's crash report system
771 'linux_breakpad%': 0, 775 'linux_breakpad%': 0,
772 776
773 # Always uses openssl. 777 # Always uses openssl.
774 'use_openssl%': 1, 778 'use_openssl%': 1,
775 779
776 'proprietary_codecs%': '<(proprietary_codecs)', 780 'proprietary_codecs%': '<(proprietary_codecs)',
781 'enable_task_manager%': 0,
777 'safe_browsing%': 0, 782 'safe_browsing%': 0,
778 'configuration_policy%': 0, 783 'configuration_policy%': 0,
779 'input_speech%': 0, 784 'input_speech%': 0,
780 'enable_web_intents%': 0, 785 'enable_web_intents%': 0,
781 'java_bridge%': 1, 786 'java_bridge%': 1,
782 # Android does not support themes. 787 # Android does not support themes.
783 'enable_themes%': 0, 788 'enable_themes%': 0,
784 789
785 # Set to 1 once we have a notification system for Android. 790 # Set to 1 once we have a notification system for Android.
786 # http://crbug.com/115320 791 # http://crbug.com/115320
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1338 ], 1343 ],
1339 'include_dirs': [ 1344 'include_dirs': [
1340 '<(DEPTH)/third_party/wtl/include', 1345 '<(DEPTH)/third_party/wtl/include',
1341 ], 1346 ],
1342 }], # OS==win 1347 }], # OS==win
1343 ['enable_register_protocol_handler==1', { 1348 ['enable_register_protocol_handler==1', {
1344 'defines': [ 1349 'defines': [
1345 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 1350 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
1346 ], 1351 ],
1347 }], 1352 }],
1353 ['enable_task_manager==1', {
1354 'defines': [
1355 'ENABLE_TASK_MANAGER=1',
1356 ],
1357 }],
1348 ['enable_web_intents==1', { 1358 ['enable_web_intents==1', {
1349 'defines': [ 1359 'defines': [
1350 'ENABLE_WEB_INTENTS=1', 1360 'ENABLE_WEB_INTENTS=1',
1351 ], 1361 ],
1352 }], 1362 }],
1353 ['OS=="win" and branding=="Chrome"', { 1363 ['OS=="win" and branding=="Chrome"', {
1354 'defines': ['ENABLE_SWIFTSHADER'], 1364 'defines': ['ENABLE_SWIFTSHADER'],
1355 }], 1365 }],
1356 ['enable_dart==1', { 1366 ['enable_dart==1', {
1357 'defines': ['WEBKIT_USING_DART=1'], 1367 'defines': ['WEBKIT_USING_DART=1'],
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2944 # settings in target dicts. SYMROOT is a special case, because many other 2954 # settings in target dicts. SYMROOT is a special case, because many other
2945 # Xcode variables depend on it, including variables such as 2955 # Xcode variables depend on it, including variables such as
2946 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2956 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2947 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2957 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2948 # files to appear (when present) in the UI as actual files and not red 2958 # files to appear (when present) in the UI as actual files and not red
2949 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2959 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2950 # and therefore SYMROOT, needs to be set at the project level. 2960 # and therefore SYMROOT, needs to be set at the project level.
2951 'SYMROOT': '<(DEPTH)/xcodebuild', 2961 'SYMROOT': '<(DEPTH)/xcodebuild',
2952 }, 2962 },
2953 } 2963 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('j') | chrome/browser/net/chrome_network_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698