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

Side by Side Diff: build/common.gypi

Issue 9949033: Removed access to prefs that does not work on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a flag enable_promo_resource_service 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 # Enables theme support, which is enabled by default. Support for 237 # Enables theme support, which is enabled by default. Support for
238 # disabling depends on the platform. 238 # disabling depends on the platform.
239 'enable_themes%': 1, 239 'enable_themes%': 1,
240 240
241 # Enables support for background apps. 241 # Enables support for background apps.
242 'enable_background%': 1, 242 'enable_background%': 1,
243 243
244 # Enable the task manager by default. 244 # Enable the task manager by default.
245 'enable_task_manager%': 1, 245 'enable_task_manager%': 1,
246
247 # Enables support for promo resource service.
248 'enable_promo_resource_service%': 1,
246 249
247 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 250 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
248 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, 251 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
249 # the input value also defines the required XI2 minor minimum version. 252 # the input value also defines the required XI2 minor minimum version.
250 # For example, use_xi2_mt=2 means XI2.2 or above version is required. 253 # For example, use_xi2_mt=2 means XI2.2 or above version is required.
251 'use_xi2_mt%': 0, 254 'use_xi2_mt%': 0,
252 255
253 # Use of precompiled headers on Windows. 256 # Use of precompiled headers on Windows.
254 # 257 #
255 # This is on by default in VS 2010, but off by default for VS 258 # This is on by default in VS 2010, but off by default for VS
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 'asan%': '<(asan)', 506 'asan%': '<(asan)',
504 'order_text_section%': '<(order_text_section)', 507 'order_text_section%': '<(order_text_section)',
505 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 508 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
506 'enable_web_intents%': '<(enable_web_intents)', 509 'enable_web_intents%': '<(enable_web_intents)',
507 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 510 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
508 'enable_plugin_installation%': '<(enable_plugin_installation)', 511 'enable_plugin_installation%': '<(enable_plugin_installation)',
509 'enable_protector_service%': '<(enable_protector_service)', 512 'enable_protector_service%': '<(enable_protector_service)',
510 'enable_session_service%': '<(enable_session_service)', 513 'enable_session_service%': '<(enable_session_service)',
511 'enable_themes%': '<(enable_themes)', 514 'enable_themes%': '<(enable_themes)',
512 'enable_background%': '<(enable_background)', 515 'enable_background%': '<(enable_background)',
516 'enable_promo_resource_service%': '<(enable_promo_resource_service)',
513 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 517 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
514 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 518 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
515 'use_canvas_skia%': '<(use_canvas_skia)', 519 'use_canvas_skia%': '<(use_canvas_skia)',
516 'tests_run%': '<(tests_run)', 520 'tests_run%': '<(tests_run)',
517 'enable_automation%': '<(enable_automation)', 521 'enable_automation%': '<(enable_automation)',
518 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 522 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
519 'enable_task_manager%': '<(enable_task_manager)', 523 'enable_task_manager%': '<(enable_task_manager)',
520 524
521 # Use system yasm instead of bundled one. 525 # Use system yasm instead of bundled one.
522 'use_system_yasm%': 0, 526 'use_system_yasm%': 0,
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 795
792 'proprietary_codecs%': '<(proprietary_codecs)', 796 'proprietary_codecs%': '<(proprietary_codecs)',
793 'enable_task_manager%': 0, 797 'enable_task_manager%': 0,
794 'safe_browsing%': 0, 798 'safe_browsing%': 0,
795 'configuration_policy%': 0, 799 'configuration_policy%': 0,
796 'input_speech%': 0, 800 'input_speech%': 0,
797 'enable_web_intents%': 0, 801 'enable_web_intents%': 0,
798 'java_bridge%': 1, 802 'java_bridge%': 1,
799 # Android does not support themes. 803 # Android does not support themes.
800 'enable_themes%': 0, 804 'enable_themes%': 0,
805
806 # Android does not support background apps.
801 'enable_background%': 0, 807 'enable_background%': 0,
802 808
809 # Android does not support promo resources service.
810 'enable_promo_resource_service%': 0,
811
803 # Sessions are store separately in the Java side. 812 # Sessions are store separately in the Java side.
804 'enable_session_service%': 0, 813 'enable_session_service%': 0,
805 814
806 # Set to 1 once we have a notification system for Android. 815 # Set to 1 once we have a notification system for Android.
807 # http://crbug.com/115320 816 # http://crbug.com/115320
808 'notifications%': 0, 817 'notifications%': 0,
809 818
810 # Builds the gtest targets as a shared_library. 819 # Builds the gtest targets as a shared_library.
811 # TODO(michaelbai): Use the fixed value 'shared_library' once it 820 # TODO(michaelbai): Use the fixed value 'shared_library' once it
812 # is fully supported. 821 # is fully supported.
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 }], 1393 }],
1385 ['enable_session_service==1', { 1394 ['enable_session_service==1', {
1386 'defines': ['ENABLE_SESSION_SERVICE=1'], 1395 'defines': ['ENABLE_SESSION_SERVICE=1'],
1387 }], 1396 }],
1388 ['enable_themes==1', { 1397 ['enable_themes==1', {
1389 'defines': ['ENABLE_THEMES=1'], 1398 'defines': ['ENABLE_THEMES=1'],
1390 }], 1399 }],
1391 ['enable_background==1', { 1400 ['enable_background==1', {
1392 'defines': ['ENABLE_BACKGROUND=1'], 1401 'defines': ['ENABLE_BACKGROUND=1'],
1393 }], 1402 }],
1403 ['enable_promo_resource_service==1', {
1404 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'],
1405 }],
1394 ['enable_automation==1', { 1406 ['enable_automation==1', {
1395 'defines': ['ENABLE_AUTOMATION=1'], 1407 'defines': ['ENABLE_AUTOMATION=1'],
1396 }], 1408 }],
1397 ], # conditions for 'target_defaults' 1409 ], # conditions for 'target_defaults'
1398 'target_conditions': [ 1410 'target_conditions': [
1399 ['enable_wexit_time_destructors==1', { 1411 ['enable_wexit_time_destructors==1', {
1400 'conditions': [ 1412 'conditions': [
1401 [ 'clang==1', { 1413 [ 'clang==1', {
1402 'cflags': [ 1414 'cflags': [
1403 '-Wexit-time-destructors', 1415 '-Wexit-time-destructors',
(...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after
2973 # settings in target dicts. SYMROOT is a special case, because many other 2985 # settings in target dicts. SYMROOT is a special case, because many other
2974 # Xcode variables depend on it, including variables such as 2986 # Xcode variables depend on it, including variables such as
2975 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2987 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2976 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2988 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2977 # files to appear (when present) in the UI as actual files and not red 2989 # files to appear (when present) in the UI as actual files and not red
2978 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2990 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2979 # and therefore SYMROOT, needs to be set at the project level. 2991 # and therefore SYMROOT, needs to be set at the project level.
2980 'SYMROOT': '<(DEPTH)/xcodebuild', 2992 'SYMROOT': '<(DEPTH)/xcodebuild',
2981 }, 2993 },
2982 } 2994 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_impl.h » ('j') | chrome/browser/profiles/profile_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698