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

Side by Side Diff: build/common.gypi

Issue 9985002: Allow SessionService to be disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed sky'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
« no previous file with comments | « no previous file | chrome/browser/browsing_data_remover.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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 'enable_web_intents_tag%': 0, 223 'enable_web_intents_tag%': 0,
224 224
225 # Webrtc compilation is enabled by default. Set to 0 to disable. 225 # Webrtc compilation is enabled by default. Set to 0 to disable.
226 'enable_webrtc%': 1, 226 'enable_webrtc%': 1,
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 use of the session service, which is enabled by default.
234 # Support for disabling depends on the platform.
235 'enable_session_service%': 1,
236
233 # Enables theme support, which is enabled by default. Support for 237 # Enables theme support, which is enabled by default. Support for
234 # disabling depends on the platform. 238 # disabling depends on the platform.
235 'enable_themes%': 1, 239 'enable_themes%': 1,
236 240
237 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 241 # 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, 242 # 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. 243 # 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. 244 # For example, use_xi2_mt=2 means XI2.2 or above version is required.
241 'use_xi2_mt%': 0, 245 'use_xi2_mt%': 0,
242 246
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 'input_speech%': '<(input_speech)', 494 'input_speech%': '<(input_speech)',
491 'notifications%': '<(notifications)', 495 'notifications%': '<(notifications)',
492 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 496 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
493 'asan%': '<(asan)', 497 'asan%': '<(asan)',
494 'order_text_section%': '<(order_text_section)', 498 'order_text_section%': '<(order_text_section)',
495 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 499 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
496 'enable_web_intents%': '<(enable_web_intents)', 500 'enable_web_intents%': '<(enable_web_intents)',
497 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 501 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
498 'enable_plugin_installation%': '<(enable_plugin_installation)', 502 'enable_plugin_installation%': '<(enable_plugin_installation)',
499 'enable_protector_service%': '<(enable_protector_service)', 503 'enable_protector_service%': '<(enable_protector_service)',
504 'enable_session_service%': '<(enable_session_service)',
500 'enable_themes%': '<(enable_themes)', 505 'enable_themes%': '<(enable_themes)',
501 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 506 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
502 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 507 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
503 'use_canvas_skia%': '<(use_canvas_skia)', 508 'use_canvas_skia%': '<(use_canvas_skia)',
504 'tests_run%': '<(tests_run)', 509 'tests_run%': '<(tests_run)',
505 'enable_automation%': '<(enable_automation)', 510 'enable_automation%': '<(enable_automation)',
506 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 511 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
507 512
508 # Whether to build for Wayland display server 513 # Whether to build for Wayland display server
509 'use_wayland%': 0, 514 'use_wayland%': 0,
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 786
782 'proprietary_codecs%': '<(proprietary_codecs)', 787 'proprietary_codecs%': '<(proprietary_codecs)',
783 'safe_browsing%': 0, 788 'safe_browsing%': 0,
784 'configuration_policy%': 0, 789 'configuration_policy%': 0,
785 'input_speech%': 0, 790 'input_speech%': 0,
786 'enable_web_intents%': 0, 791 'enable_web_intents%': 0,
787 'java_bridge%': 1, 792 'java_bridge%': 1,
788 # Android does not support themes. 793 # Android does not support themes.
789 'enable_themes%': 0, 794 'enable_themes%': 0,
790 795
796 # Sessions are store separately in the Java side.
797 'enable_session_service%': 0,
798
791 # Set to 1 once we have a notification system for Android. 799 # Set to 1 once we have a notification system for Android.
792 # http://crbug.com/115320 800 # http://crbug.com/115320
793 'notifications%': 0, 801 'notifications%': 0,
794 802
795 # Builds the gtest targets as a shared_library. 803 # Builds the gtest targets as a shared_library.
796 # TODO(michaelbai): Use the fixed value 'shared_library' once it 804 # TODO(michaelbai): Use the fixed value 'shared_library' once it
797 # is fully supported. 805 # is fully supported.
798 'gtest_target_type%': '<(gtest_target_type)', 806 'gtest_target_type%': '<(gtest_target_type)',
799 807
800 # Uses system APIs for decoding audio and video. 808 # Uses system APIs for decoding audio and video.
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 }], 1369 }],
1362 ['enable_dart==1', { 1370 ['enable_dart==1', {
1363 'defines': ['WEBKIT_USING_DART=1'], 1371 'defines': ['WEBKIT_USING_DART=1'],
1364 }], 1372 }],
1365 ['enable_plugin_installation==1', { 1373 ['enable_plugin_installation==1', {
1366 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'], 1374 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
1367 }], 1375 }],
1368 ['enable_protector_service==1', { 1376 ['enable_protector_service==1', {
1369 'defines': ['ENABLE_PROTECTOR_SERVICE=1'], 1377 'defines': ['ENABLE_PROTECTOR_SERVICE=1'],
1370 }], 1378 }],
1379 ['enable_session_service==1', {
1380 'defines': ['ENABLE_SESSION_SERVICE=1'],
1381 }],
1371 ['enable_themes==1', { 1382 ['enable_themes==1', {
1372 'defines': ['ENABLE_THEMES=1'], 1383 'defines': ['ENABLE_THEMES=1'],
1373 }], 1384 }],
1374 ['enable_automation==1', { 1385 ['enable_automation==1', {
1375 'defines': ['ENABLE_AUTOMATION=1'], 1386 'defines': ['ENABLE_AUTOMATION=1'],
1376 }], 1387 }],
1377 ], # conditions for 'target_defaults' 1388 ], # conditions for 'target_defaults'
1378 'target_conditions': [ 1389 'target_conditions': [
1379 ['enable_wexit_time_destructors==1', { 1390 ['enable_wexit_time_destructors==1', {
1380 'conditions': [ 1391 'conditions': [
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
2953 # settings in target dicts. SYMROOT is a special case, because many other 2964 # settings in target dicts. SYMROOT is a special case, because many other
2954 # Xcode variables depend on it, including variables such as 2965 # Xcode variables depend on it, including variables such as
2955 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2966 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2956 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2967 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2957 # files to appear (when present) in the UI as actual files and not red 2968 # files to appear (when present) in the UI as actual files and not red
2958 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2969 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2959 # and therefore SYMROOT, needs to be set at the project level. 2970 # and therefore SYMROOT, needs to be set at the project level.
2960 'SYMROOT': '<(DEPTH)/xcodebuild', 2971 'SYMROOT': '<(DEPTH)/xcodebuild',
2961 }, 2972 },
2962 } 2973 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browsing_data_remover.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698