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

Side by Side Diff: build/common.gypi

Issue 549153003: Dev finch trial of the data reduction proxy overrides both the primary and the fallback hosts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated tests. Created 6 years, 3 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
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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 'enable_managed_users%': 1, 594 'enable_managed_users%': 1,
595 595
596 # Platform natively supports discardable memory. 596 # Platform natively supports discardable memory.
597 'native_discardable_memory%': 0, 597 'native_discardable_memory%': 0,
598 598
599 # Platform sends memory pressure signals natively. 599 # Platform sends memory pressure signals natively.
600 'native_memory_pressure_signals%': 0, 600 'native_memory_pressure_signals%': 0,
601 601
602 'data_reduction_fallback_host%' : '', 602 'data_reduction_fallback_host%' : '',
603 'data_reduction_dev_host%' : '', 603 'data_reduction_dev_host%' : '',
604 'data_reduction_dev_fallback_host%' : '',
604 'spdy_proxy_auth_origin%' : '', 605 'spdy_proxy_auth_origin%' : '',
605 'spdy_proxy_auth_property%' : '', 606 'spdy_proxy_auth_property%' : '',
606 'spdy_proxy_auth_value%' : '', 607 'spdy_proxy_auth_value%' : '',
607 'data_reduction_proxy_probe_url%' : '', 608 'data_reduction_proxy_probe_url%' : '',
608 'data_reduction_proxy_warmup_url%' : '', 609 'data_reduction_proxy_warmup_url%' : '',
609 'data_reduction_proxy_ssl_origin%' : '', 610 'data_reduction_proxy_ssl_origin%' : '',
610 'data_reduction_proxy_alt_origin%' : '', 611 'data_reduction_proxy_alt_origin%' : '',
611 'data_reduction_proxy_alt_fallback_origin%' : '', 612 'data_reduction_proxy_alt_fallback_origin%' : '',
612 'enable_mdns%' : 0, 613 'enable_mdns%' : 0,
613 'enable_service_discovery%': 0, 614 'enable_service_discovery%': 0,
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 # By default, use ICU data file (icudtl.dat) on all platforms 961 # By default, use ICU data file (icudtl.dat) on all platforms
961 # except when building Android WebView or Chromecast. 962 # except when building Android WebView or Chromecast.
962 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). 963 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
963 # Set the data reduction proxy origin for Android Webview. 964 # Set the data reduction proxy origin for Android Webview.
964 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0', { 965 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0', {
965 'icu_use_data_file_flag%' : 1, 966 'icu_use_data_file_flag%' : 1,
966 'spdy_proxy_auth_origin%': '', 967 'spdy_proxy_auth_origin%': '',
967 'data_reduction_proxy_probe_url%': '', 968 'data_reduction_proxy_probe_url%': '',
968 'data_reduction_proxy_warmup_url%': '', 969 'data_reduction_proxy_warmup_url%': '',
969 'data_reduction_dev_host%': '', 970 'data_reduction_dev_host%': '',
971 'data_reduction_dev_fallback_host%': '',
970 'data_reduction_fallback_host%': '', 972 'data_reduction_fallback_host%': '',
971 }, { 973 }, {
972 'icu_use_data_file_flag%' : 0, 974 'icu_use_data_file_flag%' : 0,
973 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/', 975 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/',
974 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ', 976 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ',
975 'data_reduction_proxy_warmup_url%': 'http://www.gstatic.com/generate_2 04', 977 'data_reduction_proxy_warmup_url%': 'http://www.gstatic.com/generate_2 04',
976 'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/', 978 'data_reduction_dev_host%': 'https://proxy-dev.googlezip.net:443/',
bengr 2014/09/09 19:17:56 Please coordinate with kundaji@ as he's updating h
Not at Google. Contact bengr 2014/09/09 19:41:41 Thanks for letting me know. I'll update the all-pl
979 'data_reduction_dev_fallback_host%': 'http://proxy-dev.googlezip.net:8 0/',
977 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/', 980 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',
978 }], 981 }],
979 ['OS=="win" or OS=="mac"', { 982 ['OS=="win" or OS=="mac"', {
980 'enable_wifi_bootstrapping%' : 1, 983 'enable_wifi_bootstrapping%' : 1,
981 }], 984 }],
982 985
983 # Path to sas.dll, which provides the SendSAS function. 986 # Path to sas.dll, which provides the SendSAS function.
984 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx 987 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx
985 ['target_arch=="x64"', { 988 ['target_arch=="x64"', {
986 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 989 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 'use_default_render_theme%': '<(use_default_render_theme)', 1172 'use_default_render_theme%': '<(use_default_render_theme)',
1170 'enable_settings_app%': '<(enable_settings_app)', 1173 'enable_settings_app%': '<(enable_settings_app)',
1171 'google_api_key%': '<(google_api_key)', 1174 'google_api_key%': '<(google_api_key)',
1172 'google_default_client_id%': '<(google_default_client_id)', 1175 'google_default_client_id%': '<(google_default_client_id)',
1173 'google_default_client_secret%': '<(google_default_client_secret)', 1176 'google_default_client_secret%': '<(google_default_client_secret)',
1174 'enable_managed_users%': '<(enable_managed_users)', 1177 'enable_managed_users%': '<(enable_managed_users)',
1175 'native_discardable_memory%': '<(native_discardable_memory)', 1178 'native_discardable_memory%': '<(native_discardable_memory)',
1176 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 1179 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
1177 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)', 1180 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
1178 'data_reduction_dev_host%': '<(data_reduction_dev_host)', 1181 'data_reduction_dev_host%': '<(data_reduction_dev_host)',
1182 'data_reduction_dev_fallback_host%': '<(data_reduction_dev_fallback_host)',
1179 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 1183 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
1180 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 1184 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
1181 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 1185 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
1182 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', 1186 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
1183 'data_reduction_proxy_warmup_url%': '<(data_reduction_proxy_warmup_url)', 1187 'data_reduction_proxy_warmup_url%': '<(data_reduction_proxy_warmup_url)',
1184 'data_reduction_proxy_ssl_origin%' : '<(data_reduction_proxy_ssl_origin)', 1188 'data_reduction_proxy_ssl_origin%' : '<(data_reduction_proxy_ssl_origin)',
1185 'data_reduction_proxy_alt_origin%' : '<(data_reduction_proxy_alt_origin)', 1189 'data_reduction_proxy_alt_origin%' : '<(data_reduction_proxy_alt_origin)',
1186 'data_reduction_proxy_alt_fallback_origin%' : '<(data_reduction_proxy_alt_fa llback_origin)', 1190 'data_reduction_proxy_alt_fallback_origin%' : '<(data_reduction_proxy_alt_fa llback_origin)',
1187 'enable_mdns%' : '<(enable_mdns)', 1191 'enable_mdns%' : '<(enable_mdns)',
1188 'enable_service_discovery%' : '<(enable_service_discovery)', 1192 'enable_service_discovery%' : '<(enable_service_discovery)',
(...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after
2884 'defines': ['ENABLE_MANAGED_USERS=1'], 2888 'defines': ['ENABLE_MANAGED_USERS=1'],
2885 }], 2889 }],
2886 ['data_reduction_fallback_host != ""', { 2890 ['data_reduction_fallback_host != ""', {
2887 'defines': [ 2891 'defines': [
2888 'DATA_REDUCTION_FALLBACK_HOST="<(data_reduction_fallback_host)"'], 2892 'DATA_REDUCTION_FALLBACK_HOST="<(data_reduction_fallback_host)"'],
2889 }], 2893 }],
2890 ['data_reduction_dev_host != ""', { 2894 ['data_reduction_dev_host != ""', {
2891 'defines': [ 2895 'defines': [
2892 'DATA_REDUCTION_DEV_HOST="<(data_reduction_dev_host)"'], 2896 'DATA_REDUCTION_DEV_HOST="<(data_reduction_dev_host)"'],
2893 }], 2897 }],
2898 ['data_reduction_dev_fallback_host != ""', {
2899 'defines': [
2900 'DATA_REDUCTION_DEV_FALLBACK_HOST="<(data_reduction_dev_fallback_host) "'],
2901 }],
2894 ['spdy_proxy_auth_origin != ""', { 2902 ['spdy_proxy_auth_origin != ""', {
2895 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2903 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2896 }], 2904 }],
2897 ['spdy_proxy_auth_property != ""', { 2905 ['spdy_proxy_auth_property != ""', {
2898 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2906 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2899 }], 2907 }],
2900 ['spdy_proxy_auth_value != ""', { 2908 ['spdy_proxy_auth_value != ""', {
2901 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2909 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2902 }], 2910 }],
2903 ['data_reduction_proxy_probe_url != ""', { 2911 ['data_reduction_proxy_probe_url != ""', {
(...skipping 2858 matching lines...) Expand 10 before | Expand all | Expand 10 after
5762 # settings in target dicts. SYMROOT is a special case, because many other 5770 # settings in target dicts. SYMROOT is a special case, because many other
5763 # Xcode variables depend on it, including variables such as 5771 # Xcode variables depend on it, including variables such as
5764 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5772 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5765 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5773 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5766 # files to appear (when present) in the UI as actual files and not red 5774 # files to appear (when present) in the UI as actual files and not red
5767 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5775 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5768 # and therefore SYMROOT, needs to be set at the project level. 5776 # and therefore SYMROOT, needs to be set at the project level.
5769 'SYMROOT': '<(DEPTH)/xcodebuild', 5777 'SYMROOT': '<(DEPTH)/xcodebuild',
5770 }, 5778 },
5771 } 5779 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698