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

Side by Side Diff: build/common.gypi

Issue 600503002: Cleanup unused data reduction proxy entries from gypi file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 597
598 # Managed users are enabled by default. 598 # Managed users are enabled by default.
599 'enable_managed_users%': 1, 599 'enable_managed_users%': 1,
600 600
601 # Platform natively supports discardable memory. 601 # Platform natively supports discardable memory.
602 'native_discardable_memory%': 0, 602 'native_discardable_memory%': 0,
603 603
604 # Platform sends memory pressure signals natively. 604 # Platform sends memory pressure signals natively.
605 'native_memory_pressure_signals%': 0, 605 'native_memory_pressure_signals%': 0,
606 606
607 'data_reduction_fallback_host%' : '',
608 'data_reduction_dev_host%' : '',
609 'data_reduction_dev_fallback_host%' : '',
610 'spdy_proxy_auth_origin%' : '',
611 'spdy_proxy_auth_property%' : '', 607 'spdy_proxy_auth_property%' : '',
612 'spdy_proxy_auth_value%' : '', 608 'spdy_proxy_auth_value%' : '',
613 'data_reduction_proxy_probe_url%' : '',
614 'data_reduction_proxy_warmup_url%' : '',
615 'data_reduction_proxy_ssl_origin%' : '',
616 'data_reduction_proxy_alt_origin%' : '',
617 'data_reduction_proxy_alt_fallback_origin%' : '',
618 'enable_mdns%' : 0, 609 'enable_mdns%' : 0,
619 'enable_service_discovery%': 0, 610 'enable_service_discovery%': 0,
620 'enable_wifi_bootstrapping%': 0, 611 'enable_wifi_bootstrapping%': 0,
621 'enable_hangout_services_extension%': 0, 612 'enable_hangout_services_extension%': 0,
622 613
623 # Enable the Syzygy optimization step. 614 # Enable the Syzygy optimization step.
624 'syzygy_optimize%': 0, 615 'syzygy_optimize%': 0,
625 616
626 # Enable hole punching for the protected video. 617 # Enable hole punching for the protected video.
627 'video_hole%': 0, 618 'video_hole%': 0,
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 'remoting%': 0, 961 'remoting%': 0,
971 'enable_printing%': 0, 962 'enable_printing%': 0,
972 }], 963 }],
973 964
974 # By default, use ICU data file (icudtl.dat) on all platforms 965 # By default, use ICU data file (icudtl.dat) on all platforms
975 # except when building Android WebView or Chromecast. 966 # except when building Android WebView or Chromecast.
976 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). 967 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
977 # Set the data reduction proxy origin for Android Webview. 968 # Set the data reduction proxy origin for Android Webview.
978 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0', { 969 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0', {
979 'icu_use_data_file_flag%' : 1, 970 'icu_use_data_file_flag%' : 1,
980 'spdy_proxy_auth_origin%': '',
981 'data_reduction_proxy_probe_url%': '',
982 'data_reduction_proxy_warmup_url%': '',
983 'data_reduction_dev_host%': '',
984 'data_reduction_dev_fallback_host%': '',
985 'data_reduction_fallback_host%': '',
986 }, { 971 }, {
987 'icu_use_data_file_flag%' : 0, 972 'icu_use_data_file_flag%' : 0,
988 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/',
bengr 2014/09/24 17:48:41 Does webview still work with the data reduction pr
Not at Google. Contact bengr 2014/09/29 23:51:43 Discussed in person. SPDY_PROXY_AUTH_ORIGIN is no
989 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ',
990 'data_reduction_proxy_warmup_url%': 'http://www.gstatic.com/generate_2 04',
991 'data_reduction_dev_host%': 'https://proxy-dev.googlezip.net:443/',
992 'data_reduction_dev_fallback_host%': 'http://proxy-dev.googlezip.net:8 0/',
993 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',
994 }], 973 }],
995 ['OS=="win" or OS=="mac"', { 974 ['OS=="win" or OS=="mac"', {
996 'enable_wifi_bootstrapping%' : 1, 975 'enable_wifi_bootstrapping%' : 1,
997 }], 976 }],
998 977
999 # Path to sas.dll, which provides the SendSAS function. 978 # Path to sas.dll, which provides the SendSAS function.
1000 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx 979 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx
1001 ['target_arch=="x64"', { 980 ['target_arch=="x64"', {
1002 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 981 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
1003 }, { 982 }, {
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 'create_standalone_apk%': 1, 1162 'create_standalone_apk%': 1,
1184 'enable_app_list%': '<(enable_app_list)', 1163 'enable_app_list%': '<(enable_app_list)',
1185 'use_default_render_theme%': '<(use_default_render_theme)', 1164 'use_default_render_theme%': '<(use_default_render_theme)',
1186 'enable_settings_app%': '<(enable_settings_app)', 1165 'enable_settings_app%': '<(enable_settings_app)',
1187 'google_api_key%': '<(google_api_key)', 1166 'google_api_key%': '<(google_api_key)',
1188 'google_default_client_id%': '<(google_default_client_id)', 1167 'google_default_client_id%': '<(google_default_client_id)',
1189 'google_default_client_secret%': '<(google_default_client_secret)', 1168 'google_default_client_secret%': '<(google_default_client_secret)',
1190 'enable_managed_users%': '<(enable_managed_users)', 1169 'enable_managed_users%': '<(enable_managed_users)',
1191 'native_discardable_memory%': '<(native_discardable_memory)', 1170 'native_discardable_memory%': '<(native_discardable_memory)',
1192 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 1171 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
1193 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
1194 'data_reduction_dev_host%': '<(data_reduction_dev_host)',
1195 'data_reduction_dev_fallback_host%': '<(data_reduction_dev_fallback_host)',
1196 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
1197 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 1172 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
1198 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 1173 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
1199 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
1200 'data_reduction_proxy_warmup_url%': '<(data_reduction_proxy_warmup_url)',
1201 'data_reduction_proxy_ssl_origin%' : '<(data_reduction_proxy_ssl_origin)',
1202 'data_reduction_proxy_alt_origin%' : '<(data_reduction_proxy_alt_origin)',
1203 'data_reduction_proxy_alt_fallback_origin%' : '<(data_reduction_proxy_alt_fa llback_origin)',
1204 'enable_mdns%' : '<(enable_mdns)', 1174 'enable_mdns%' : '<(enable_mdns)',
1205 'enable_service_discovery%' : '<(enable_service_discovery)', 1175 'enable_service_discovery%' : '<(enable_service_discovery)',
1206 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', 1176 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)',
1207 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ', 1177 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ',
1208 'v8_optimized_debug%': '<(v8_optimized_debug)', 1178 'v8_optimized_debug%': '<(v8_optimized_debug)',
1209 'proprietary_codecs%': '<(proprietary_codecs)', 1179 'proprietary_codecs%': '<(proprietary_codecs)',
1210 'use_goma%': '<(use_goma)', 1180 'use_goma%': '<(use_goma)',
1211 'gomadir%': '<(gomadir)', 1181 'gomadir%': '<(gomadir)',
1212 'video_hole%': '<(video_hole)', 1182 'video_hole%': '<(video_hole)',
1213 'enable_load_completion_hacks%': '<(enable_load_completion_hacks)', 1183 'enable_load_completion_hacks%': '<(enable_load_completion_hacks)',
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
2899 }], 2869 }],
2900 ['disable_ftp_support==1', { 2870 ['disable_ftp_support==1', {
2901 'defines': ['DISABLE_FTP_SUPPORT=1'], 2871 'defines': ['DISABLE_FTP_SUPPORT=1'],
2902 }], 2872 }],
2903 ['use_icu_alternatives_on_android==1', { 2873 ['use_icu_alternatives_on_android==1', {
2904 'defines': ['USE_ICU_ALTERNATIVES_ON_ANDROID=1'], 2874 'defines': ['USE_ICU_ALTERNATIVES_ON_ANDROID=1'],
2905 }], 2875 }],
2906 ['enable_managed_users==1', { 2876 ['enable_managed_users==1', {
2907 'defines': ['ENABLE_MANAGED_USERS=1'], 2877 'defines': ['ENABLE_MANAGED_USERS=1'],
2908 }], 2878 }],
2909 ['data_reduction_fallback_host != ""', {
2910 'defines': [
2911 'DATA_REDUCTION_FALLBACK_HOST="<(data_reduction_fallback_host)"'],
2912 }],
2913 ['data_reduction_dev_host != ""', {
2914 'defines': [
2915 'DATA_REDUCTION_DEV_HOST="<(data_reduction_dev_host)"'],
2916 }],
2917 ['data_reduction_dev_fallback_host != ""', {
2918 'defines': [
2919 'DATA_REDUCTION_DEV_FALLBACK_HOST="<(data_reduction_dev_fallback_host) "'],
2920 }],
2921 ['spdy_proxy_auth_origin != ""', {
2922 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2923 }],
2924 ['spdy_proxy_auth_property != ""', { 2879 ['spdy_proxy_auth_property != ""', {
2925 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2880 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2926 }], 2881 }],
2927 ['spdy_proxy_auth_value != ""', { 2882 ['spdy_proxy_auth_value != ""', {
2928 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2883 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2929 }], 2884 }],
2930 ['data_reduction_proxy_probe_url != ""', {
2931 'defines': [
2932 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2933 }],
2934 ['data_reduction_proxy_warmup_url != ""', {
2935 'defines': [
2936 'DATA_REDUCTION_PROXY_WARMUP_URL="<(data_reduction_proxy_warmup_url)"' ],
2937 }],
2938 ['data_reduction_proxy_ssl_origin != ""', {
2939 'defines': [
2940 'DATA_REDUCTION_PROXY_SSL_ORIGIN="<(data_reduction_proxy_ssl_origin)"' ],
2941 }],
2942 ['data_reduction_proxy_alt_origin != ""', {
2943 'defines': [
2944 'DATA_REDUCTION_PROXY_ALT_ORIGIN="<(data_reduction_proxy_alt_origin)"' ],
2945 }],
2946 ['data_reduction_proxy_alt_fallback_origin != ""', {
2947 'defines': [
2948 'DATA_REDUCTION_PROXY_ALT_FALLBACK_ORIGIN="<(data_reduction_proxy_alt_ fallback_origin)"'],
2949 }],
2950 ['enable_mdns==1', { 2885 ['enable_mdns==1', {
2951 'defines': ['ENABLE_MDNS=1'], 2886 'defines': ['ENABLE_MDNS=1'],
2952 }], 2887 }],
2953 ['enable_service_discovery==1', { 2888 ['enable_service_discovery==1', {
2954 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ], 2889 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
2955 }], 2890 }],
2956 ['enable_wifi_bootstrapping==1', { 2891 ['enable_wifi_bootstrapping==1', {
2957 'defines' : [ 'ENABLE_WIFI_BOOTSTRAPPING=1' ], 2892 'defines' : [ 'ENABLE_WIFI_BOOTSTRAPPING=1' ],
2958 }], 2893 }],
2959 ['enable_hangout_services_extension==1', { 2894 ['enable_hangout_services_extension==1', {
(...skipping 2820 matching lines...) Expand 10 before | Expand all | Expand 10 after
5780 # settings in target dicts. SYMROOT is a special case, because many other 5715 # settings in target dicts. SYMROOT is a special case, because many other
5781 # Xcode variables depend on it, including variables such as 5716 # Xcode variables depend on it, including variables such as
5782 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5717 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5718 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5784 # files to appear (when present) in the UI as actual files and not red 5719 # files to appear (when present) in the UI as actual files and not red
5785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5720 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5786 # and therefore SYMROOT, needs to be set at the project level. 5721 # and therefore SYMROOT, needs to be set at the project level.
5787 'SYMROOT': '<(DEPTH)/xcodebuild', 5722 'SYMROOT': '<(DEPTH)/xcodebuild',
5788 }, 5723 },
5789 } 5724 }
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