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

Side by Side Diff: build/common.gypi

Issue 23458016: Added probe to determine if data reduction proxy can be used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed additional comments Created 7 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 421
422 # Platform natively supports discardable memory. 422 # Platform natively supports discardable memory.
423 'native_discardable_memory%': 0, 423 'native_discardable_memory%': 0,
424 424
425 # Platform sends memory pressure signals natively. 425 # Platform sends memory pressure signals natively.
426 'native_memory_pressure_signals%': 0, 426 'native_memory_pressure_signals%': 0,
427 427
428 'spdy_proxy_auth_origin%' : '', 428 'spdy_proxy_auth_origin%' : '',
429 'spdy_proxy_auth_property%' : '', 429 'spdy_proxy_auth_property%' : '',
430 'spdy_proxy_auth_value%' : '', 430 'spdy_proxy_auth_value%' : '',
431 'data_reduction_proxy_probe_url%' : '',
431 'enable_mdns%' : 0, 432 'enable_mdns%' : 0,
432 433
433 'conditions': [ 434 'conditions': [
434 # A flag for POSIX platforms 435 # A flag for POSIX platforms
435 ['OS=="win"', { 436 ['OS=="win"', {
436 'os_posix%': 0, 437 'os_posix%': 0,
437 }, { 438 }, {
438 'os_posix%': 1, 439 'os_posix%': 1,
439 }], 440 }],
440 441
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 'enable_settings_app%': '<(enable_settings_app)', 868 'enable_settings_app%': '<(enable_settings_app)',
868 'google_api_key%': '<(google_api_key)', 869 'google_api_key%': '<(google_api_key)',
869 'google_default_client_id%': '<(google_default_client_id)', 870 'google_default_client_id%': '<(google_default_client_id)',
870 'google_default_client_secret%': '<(google_default_client_secret)', 871 'google_default_client_secret%': '<(google_default_client_secret)',
871 'enable_managed_users%': '<(enable_managed_users)', 872 'enable_managed_users%': '<(enable_managed_users)',
872 'native_discardable_memory%': '<(native_discardable_memory)', 873 'native_discardable_memory%': '<(native_discardable_memory)',
873 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 874 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
874 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 875 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
875 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 876 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
876 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 877 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
878 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
877 'enable_mdns%' : '<(enable_mdns)', 879 'enable_mdns%' : '<(enable_mdns)',
878 'v8_optimized_debug': '<(v8_optimized_debug)', 880 'v8_optimized_debug': '<(v8_optimized_debug)',
879 'proprietary_codecs%': '<(proprietary_codecs)', 881 'proprietary_codecs%': '<(proprietary_codecs)',
880 882
881 # Use system nspr instead of the bundled one. 883 # Use system nspr instead of the bundled one.
882 'use_system_nspr%': 0, 884 'use_system_nspr%': 0,
883 885
884 # Use system protobuf instead of bundled one. 886 # Use system protobuf instead of bundled one.
885 'use_system_protobuf%': 0, 887 'use_system_protobuf%': 0,
886 888
(...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after
2298 }], 2300 }],
2299 ['spdy_proxy_auth_origin != ""', { 2301 ['spdy_proxy_auth_origin != ""', {
2300 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2302 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2301 }], 2303 }],
2302 ['spdy_proxy_auth_property != ""', { 2304 ['spdy_proxy_auth_property != ""', {
2303 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2305 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2304 }], 2306 }],
2305 ['spdy_proxy_auth_value != ""', { 2307 ['spdy_proxy_auth_value != ""', {
2306 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2308 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2307 }], 2309 }],
2310 ['data_reduction_proxy_probe_url != ""', {
2311 'defines': [
2312 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2313 }],
2308 ['enable_mdns==1', { 2314 ['enable_mdns==1', {
2309 'defines': ['ENABLE_MDNS=1'], 2315 'defines': ['ENABLE_MDNS=1'],
2310 }] 2316 }]
2311 ], # conditions for 'target_defaults' 2317 ], # conditions for 'target_defaults'
2312 'target_conditions': [ 2318 'target_conditions': [
2313 ['enable_wexit_time_destructors==1', { 2319 ['enable_wexit_time_destructors==1', {
2314 'conditions': [ 2320 'conditions': [
2315 [ 'clang==1', { 2321 [ 'clang==1', {
2316 'cflags': [ 2322 'cflags': [
2317 '-Wexit-time-destructors', 2323 '-Wexit-time-destructors',
(...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after
4713 # settings in target dicts. SYMROOT is a special case, because many other 4719 # settings in target dicts. SYMROOT is a special case, because many other
4714 # Xcode variables depend on it, including variables such as 4720 # Xcode variables depend on it, including variables such as
4715 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4721 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4716 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4722 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4717 # files to appear (when present) in the UI as actual files and not red 4723 # files to appear (when present) in the UI as actual files and not red
4718 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4724 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4719 # and therefore SYMROOT, needs to be set at the project level. 4725 # and therefore SYMROOT, needs to be set at the project level.
4720 'SYMROOT': '<(DEPTH)/xcodebuild', 4726 'SYMROOT': '<(DEPTH)/xcodebuild',
4721 }, 4727 },
4722 } 4728 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698