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

Side by Side Diff: build/common.gypi

Issue 288003004: provide a build time flag to enable connecting to production wallet servers by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: hinge on buildtype instead of branding Created 6 years, 7 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 | components/autofill/content/browser/wallet/wallet_service_url.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 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 # Support for disabling depends on the platform. 466 # Support for disabling depends on the platform.
467 'enable_session_service%': 1, 467 'enable_session_service%': 1,
468 468
469 # Enables theme support, which is enabled by default. Support for 469 # Enables theme support, which is enabled by default. Support for
470 # disabling depends on the platform. 470 # disabling depends on the platform.
471 'enable_themes%': 1, 471 'enable_themes%': 1,
472 472
473 # Enables autofill dialog and associated features; disabled by default. 473 # Enables autofill dialog and associated features; disabled by default.
474 'enable_autofill_dialog%' : 0, 474 'enable_autofill_dialog%' : 0,
475 475
476 # Defaults Wallet integration in Autofill dialog to use production
477 # servers. Unofficial builds won't have the proper API keys.
478 'enable_prod_wallet_service%': 0,
479
476 # Enables support for background apps. 480 # Enables support for background apps.
477 'enable_background%': 1, 481 'enable_background%': 1,
478 482
479 # Enable the task manager by default. 483 # Enable the task manager by default.
480 'enable_task_manager%': 1, 484 'enable_task_manager%': 1,
481 485
482 # Enables used resource whitelist generation; disabled by default. 486 # Enables used resource whitelist generation; disabled by default.
483 'enable_resource_whitelist_generation%': 0, 487 'enable_resource_whitelist_generation%': 0,
484 488
485 # Enable FILE support by default. 489 # Enable FILE support by default.
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 'proprietary_codecs%': 0, 695 'proprietary_codecs%': 0,
692 }], 696 }],
693 697
694 ['OS=="mac" or OS=="ios"', { 698 ['OS=="mac" or OS=="ios"', {
695 'native_discardable_memory%': 1, 699 'native_discardable_memory%': 1,
696 'native_memory_pressure_signals%': 1, 700 'native_memory_pressure_signals%': 1,
697 }], 701 }],
698 702
699 # Enable autofill dialog for Android, Mac and Views-enabled platforms. 703 # Enable autofill dialog for Android, Mac and Views-enabled platforms.
700 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { 704 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', {
701 'enable_autofill_dialog%': 1 705 'enable_autofill_dialog%': 1,
706
707 'conditions': [
708 ['buildtype=="Official"', {
709 'enable_prod_wallet_service%': 1,
710 }],
711 ]
702 }], 712 }],
703 713
704 ['OS=="android"', { 714 ['OS=="android"', {
705 'enable_webrtc%': 1, 715 'enable_webrtc%': 1,
706 }], 716 }],
707 717
708 ['OS=="ios"', { 718 ['OS=="ios"', {
709 'disable_ftp_support%': 1, 719 'disable_ftp_support%': 1,
710 'enable_extensions%': 0, 720 'enable_extensions%': 0,
711 'enable_google_now%': 0, 721 'enable_google_now%': 0,
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 'use_custom_libcxx%': '<(use_custom_libcxx)', 1043 'use_custom_libcxx%': '<(use_custom_libcxx)',
1034 'clang_type_profiler%': '<(clang_type_profiler)', 1044 'clang_type_profiler%': '<(clang_type_profiler)',
1035 'order_profiling%': '<(order_profiling)', 1045 'order_profiling%': '<(order_profiling)',
1036 'order_text_section%': '<(order_text_section)', 1046 'order_text_section%': '<(order_text_section)',
1037 'enable_extensions%': '<(enable_extensions)', 1047 'enable_extensions%': '<(enable_extensions)',
1038 'enable_plugin_installation%': '<(enable_plugin_installation)', 1048 'enable_plugin_installation%': '<(enable_plugin_installation)',
1039 'enable_plugins%': '<(enable_plugins)', 1049 'enable_plugins%': '<(enable_plugins)',
1040 'enable_session_service%': '<(enable_session_service)', 1050 'enable_session_service%': '<(enable_session_service)',
1041 'enable_themes%': '<(enable_themes)', 1051 'enable_themes%': '<(enable_themes)',
1042 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 1052 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
1053 'enable_prod_wallet_service%': '<(enable_prod_wallet_service)',
1043 'enable_background%': '<(enable_background)', 1054 'enable_background%': '<(enable_background)',
1044 'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', 1055 'linux_use_bundled_gold%': '<(linux_use_bundled_gold)',
1045 'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)', 1056 'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)',
1046 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 1057 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
1047 'linux_use_debug_fission%': '<(linux_use_debug_fission)', 1058 'linux_use_debug_fission%': '<(linux_use_debug_fission)',
1048 'use_canvas_skia%': '<(use_canvas_skia)', 1059 'use_canvas_skia%': '<(use_canvas_skia)',
1049 'test_isolation_mode%': '<(test_isolation_mode)', 1060 'test_isolation_mode%': '<(test_isolation_mode)',
1050 'test_isolation_outdir%': '<(test_isolation_outdir)', 1061 'test_isolation_outdir%': '<(test_isolation_outdir)',
1051 'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)', 1062 'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)',
1052 'enable_printing%': '<(enable_printing)', 1063 'enable_printing%': '<(enable_printing)',
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2588 }], 2599 }],
2589 ['enable_session_service==1', { 2600 ['enable_session_service==1', {
2590 'defines': ['ENABLE_SESSION_SERVICE=1'], 2601 'defines': ['ENABLE_SESSION_SERVICE=1'],
2591 }], 2602 }],
2592 ['enable_themes==1', { 2603 ['enable_themes==1', {
2593 'defines': ['ENABLE_THEMES=1'], 2604 'defines': ['ENABLE_THEMES=1'],
2594 }], 2605 }],
2595 ['enable_autofill_dialog==1', { 2606 ['enable_autofill_dialog==1', {
2596 'defines': ['ENABLE_AUTOFILL_DIALOG=1'], 2607 'defines': ['ENABLE_AUTOFILL_DIALOG=1'],
2597 }], 2608 }],
2609 ['enable_prod_wallet_service==1', {
2610 'defines': ['ENABLE_PROD_WALLET_SERVICE=1'],
2611 }],
2598 ['enable_background==1', { 2612 ['enable_background==1', {
2599 'defines': ['ENABLE_BACKGROUND=1'], 2613 'defines': ['ENABLE_BACKGROUND=1'],
2600 }], 2614 }],
2601 ['enable_google_now==1', { 2615 ['enable_google_now==1', {
2602 'defines': ['ENABLE_GOOGLE_NOW=1'], 2616 'defines': ['ENABLE_GOOGLE_NOW=1'],
2603 }], 2617 }],
2604 ['cld_version!=0', { 2618 ['cld_version!=0', {
2605 'defines': ['CLD_VERSION=<(cld_version)'], 2619 'defines': ['CLD_VERSION=<(cld_version)'],
2606 }], 2620 }],
2607 ['cld2_dynamic!=0', { 2621 ['cld2_dynamic!=0', {
(...skipping 2671 matching lines...) Expand 10 before | Expand all | Expand 10 after
5279 # settings in target dicts. SYMROOT is a special case, because many other 5293 # settings in target dicts. SYMROOT is a special case, because many other
5280 # Xcode variables depend on it, including variables such as 5294 # Xcode variables depend on it, including variables such as
5281 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5295 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5282 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5296 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5283 # files to appear (when present) in the UI as actual files and not red 5297 # files to appear (when present) in the UI as actual files and not red
5284 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5298 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5285 # and therefore SYMROOT, needs to be set at the project level. 5299 # and therefore SYMROOT, needs to be set at the project level.
5286 'SYMROOT': '<(DEPTH)/xcodebuild', 5300 'SYMROOT': '<(DEPTH)/xcodebuild',
5287 }, 5301 },
5288 } 5302 }
OLDNEW
« no previous file with comments | « no previous file | components/autofill/content/browser/wallet/wallet_service_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698