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

Side by Side Diff: build/common.gypi

Issue 294173002: Add enable_wifi_bootstrapping variable to common.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | 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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 'native_memory_pressure_signals%': 0, 541 'native_memory_pressure_signals%': 0,
542 542
543 'data_reduction_fallback_host%' : '', 543 'data_reduction_fallback_host%' : '',
544 'data_reduction_dev_host%' : '', 544 'data_reduction_dev_host%' : '',
545 'spdy_proxy_auth_origin%' : '', 545 'spdy_proxy_auth_origin%' : '',
546 'spdy_proxy_auth_property%' : '', 546 'spdy_proxy_auth_property%' : '',
547 'spdy_proxy_auth_value%' : '', 547 'spdy_proxy_auth_value%' : '',
548 'data_reduction_proxy_probe_url%' : '', 548 'data_reduction_proxy_probe_url%' : '',
549 'enable_mdns%' : 0, 549 'enable_mdns%' : 0,
550 'enable_service_discovery%': 0, 550 'enable_service_discovery%': 0,
551 'enable_wifi_bootstrapping%': 0,
551 'enable_hangout_services_extension%': 0, 552 'enable_hangout_services_extension%': 0,
552 553
553 # Enable the Syzygy optimization step. 554 # Enable the Syzygy optimization step.
554 'syzygy_optimize%': 0, 555 'syzygy_optimize%': 0,
555 556
556 # Enable hole punching for the protected video. 557 # Enable hole punching for the protected video.
557 'video_hole%': 0, 558 'video_hole%': 0,
558 559
559 # Automatically select platforms under ozone. Turn this off to 560 # Automatically select platforms under ozone. Turn this off to
560 # build only explicitly selected platforms. 561 # build only explicitly selected platforms.
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 'data_reduction_proxy_probe_url%': '', 902 'data_reduction_proxy_probe_url%': '',
902 'data_reduction_dev_host%': '', 903 'data_reduction_dev_host%': '',
903 'data_reduction_fallback_host%': '', 904 'data_reduction_fallback_host%': '',
904 }, { 905 }, {
905 'icu_use_data_file_flag%' : 0, 906 'icu_use_data_file_flag%' : 0,
906 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/', 907 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/',
907 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ', 908 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ',
908 'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/', 909 'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/',
909 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/', 910 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',
910 }], 911 }],
912 ['OS=="win" or OS=="mac"', {
913 'enable_wifi_bootstrapping%' : 1,
914 }],
911 ], 915 ],
912 916
913 # Set this to 1 to enable use of concatenated impulse responses 917 # Set this to 1 to enable use of concatenated impulse responses
914 # for the HRTF panner in WebAudio. 918 # for the HRTF panner in WebAudio.
915 'use_concatenated_impulse_responses': 1, 919 'use_concatenated_impulse_responses': 1,
916 920
917 # You can set the variable 'use_official_google_api_keys' to 1 921 # You can set the variable 'use_official_google_api_keys' to 1
918 # to use the Google-internal file containing official API keys 922 # to use the Google-internal file containing official API keys
919 # for Google Chrome even in a developer build. Setting this 923 # for Google Chrome even in a developer build. Setting this
920 # variable explicitly to 1 will cause your build to fail if the 924 # variable explicitly to 1 will cause your build to fail if the
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 'native_discardable_memory%': '<(native_discardable_memory)', 1083 'native_discardable_memory%': '<(native_discardable_memory)',
1080 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 1084 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
1081 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)', 1085 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
1082 'data_reduction_dev_host%': '<(data_reduction_dev_host)', 1086 'data_reduction_dev_host%': '<(data_reduction_dev_host)',
1083 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 1087 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
1084 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 1088 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
1085 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 1089 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
1086 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', 1090 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
1087 'enable_mdns%' : '<(enable_mdns)', 1091 'enable_mdns%' : '<(enable_mdns)',
1088 'enable_service_discovery%' : '<(enable_service_discovery)', 1092 'enable_service_discovery%' : '<(enable_service_discovery)',
1093 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)',
1089 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ', 1094 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ',
1090 'v8_optimized_debug%': '<(v8_optimized_debug)', 1095 'v8_optimized_debug%': '<(v8_optimized_debug)',
1091 'proprietary_codecs%': '<(proprietary_codecs)', 1096 'proprietary_codecs%': '<(proprietary_codecs)',
1092 'use_goma%': '<(use_goma)', 1097 'use_goma%': '<(use_goma)',
1093 'gomadir%': '<(gomadir)', 1098 'gomadir%': '<(gomadir)',
1094 'video_hole%': '<(video_hole)', 1099 'video_hole%': '<(video_hole)',
1095 1100
1096 # Use system protobuf instead of bundled one. 1101 # Use system protobuf instead of bundled one.
1097 'use_system_protobuf%': 0, 1102 'use_system_protobuf%': 0,
1098 1103
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
1959 }], 1964 }],
1960 ['enable_hangout_services_extension==1', { 1965 ['enable_hangout_services_extension==1', {
1961 'grit_defines': ['-D', 'enable_hangout_services_extension'], 1966 'grit_defines': ['-D', 'enable_hangout_services_extension'],
1962 }], 1967 }],
1963 ['enable_task_manager==1', { 1968 ['enable_task_manager==1', {
1964 'grit_defines': ['-D', 'enable_task_manager'], 1969 'grit_defines': ['-D', 'enable_task_manager'],
1965 }], 1970 }],
1966 ['notifications==1', { 1971 ['notifications==1', {
1967 'grit_defines': ['-D', 'enable_notifications'], 1972 'grit_defines': ['-D', 'enable_notifications'],
1968 }], 1973 }],
1974 ['enable_wifi_bootstrapping==1', {
1975 'grit_defines': ['-D', 'enable_wifi_bootstrapping'],
1976 }],
1969 ['enable_resource_whitelist_generation==1 and OS!="win"', { 1977 ['enable_resource_whitelist_generation==1 and OS!="win"', {
1970 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'], 1978 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'],
1971 }], 1979 }],
1972 ['enable_resource_whitelist_generation==1 and OS=="win"', { 1980 ['enable_resource_whitelist_generation==1 and OS=="win"', {
1973 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'], 1981 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'],
1974 }], 1982 }],
1975 ['enable_mdns==1 or OS=="mac"', { 1983 ['enable_mdns==1 or OS=="mac"', {
1976 'grit_defines': ['-D', 'enable_service_discovery'], 1984 'grit_defines': ['-D', 'enable_service_discovery'],
1977 'enable_service_discovery%': 1 1985 'enable_service_discovery%': 1
1978 }], 1986 }],
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
2674 ['data_reduction_proxy_probe_url != ""', { 2682 ['data_reduction_proxy_probe_url != ""', {
2675 'defines': [ 2683 'defines': [
2676 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], 2684 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2677 }], 2685 }],
2678 ['enable_mdns==1', { 2686 ['enable_mdns==1', {
2679 'defines': ['ENABLE_MDNS=1'], 2687 'defines': ['ENABLE_MDNS=1'],
2680 }], 2688 }],
2681 ['enable_service_discovery==1', { 2689 ['enable_service_discovery==1', {
2682 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ], 2690 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
2683 }], 2691 }],
2692 ['enable_wifi_bootstrapping==1', {
2693 'defines' : [ 'ENABLE_WIFI_BOOTSTRAPPING=1' ],
2694 }],
2684 ['enable_hangout_services_extension==1', { 2695 ['enable_hangout_services_extension==1', {
2685 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'], 2696 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'],
2686 }], 2697 }],
2687 ['enable_ipc_fuzzer==1', { 2698 ['enable_ipc_fuzzer==1', {
2688 'defines': ['ENABLE_IPC_FUZZER=1'], 2699 'defines': ['ENABLE_IPC_FUZZER=1'],
2689 }], 2700 }],
2690 ['video_hole==1', { 2701 ['video_hole==1', {
2691 'defines': ['VIDEO_HOLE=1'], 2702 'defines': ['VIDEO_HOLE=1'],
2692 }], 2703 }],
2693 ], # conditions for 'target_defaults' 2704 ], # conditions for 'target_defaults'
(...skipping 2632 matching lines...) Expand 10 before | Expand all | Expand 10 after
5326 # settings in target dicts. SYMROOT is a special case, because many other 5337 # settings in target dicts. SYMROOT is a special case, because many other
5327 # Xcode variables depend on it, including variables such as 5338 # Xcode variables depend on it, including variables such as
5328 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5339 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5329 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5340 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5330 # files to appear (when present) in the UI as actual files and not red 5341 # files to appear (when present) in the UI as actual files and not red
5331 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5342 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5332 # and therefore SYMROOT, needs to be set at the project level. 5343 # and therefore SYMROOT, needs to be set at the project level.
5333 'SYMROOT': '<(DEPTH)/xcodebuild', 5344 'SYMROOT': '<(DEPTH)/xcodebuild',
5334 }, 5345 },
5335 } 5346 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698