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

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 comments Created 7 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
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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 435
436 # Platform natively supports discardable memory. 436 # Platform natively supports discardable memory.
437 'native_discardable_memory%': 0, 437 'native_discardable_memory%': 0,
438 438
439 # Platform sends memory pressure signals natively. 439 # Platform sends memory pressure signals natively.
440 'native_memory_pressure_signals%': 0, 440 'native_memory_pressure_signals%': 0,
441 441
442 'spdy_proxy_auth_origin%' : '', 442 'spdy_proxy_auth_origin%' : '',
443 'spdy_proxy_auth_property%' : '', 443 'spdy_proxy_auth_property%' : '',
444 'spdy_proxy_auth_value%' : '', 444 'spdy_proxy_auth_value%' : '',
445 'data_reduction_proxy_probe_url%' : '',
445 'enable_mdns%' : 0, 446 'enable_mdns%' : 0,
446 447
447 'conditions': [ 448 'conditions': [
448 # A flag for POSIX platforms 449 # A flag for POSIX platforms
449 ['OS=="win"', { 450 ['OS=="win"', {
450 'os_posix%': 0, 451 'os_posix%': 0,
451 }, { 452 }, {
452 'os_posix%': 1, 453 'os_posix%': 1,
453 }], 454 }],
454 455
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 'enable_settings_app%': '<(enable_settings_app)', 886 'enable_settings_app%': '<(enable_settings_app)',
886 'google_api_key%': '<(google_api_key)', 887 'google_api_key%': '<(google_api_key)',
887 'google_default_client_id%': '<(google_default_client_id)', 888 'google_default_client_id%': '<(google_default_client_id)',
888 'google_default_client_secret%': '<(google_default_client_secret)', 889 'google_default_client_secret%': '<(google_default_client_secret)',
889 'enable_managed_users%': '<(enable_managed_users)', 890 'enable_managed_users%': '<(enable_managed_users)',
890 'native_discardable_memory%': '<(native_discardable_memory)', 891 'native_discardable_memory%': '<(native_discardable_memory)',
891 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 892 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
892 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 893 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
893 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 894 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
894 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 895 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
896 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
895 'enable_mdns%' : '<(enable_mdns)', 897 'enable_mdns%' : '<(enable_mdns)',
896 'v8_optimized_debug': '<(v8_optimized_debug)', 898 'v8_optimized_debug': '<(v8_optimized_debug)',
897 'proprietary_codecs%': '<(proprietary_codecs)', 899 'proprietary_codecs%': '<(proprietary_codecs)',
898 900
899 # Use system nspr instead of the bundled one. 901 # Use system nspr instead of the bundled one.
900 'use_system_nspr%': 0, 902 'use_system_nspr%': 0,
901 903
902 # Use system protobuf instead of bundled one. 904 # Use system protobuf instead of bundled one.
903 'use_system_protobuf%': 0, 905 'use_system_protobuf%': 0,
904 906
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2328 }], 2330 }],
2329 ['spdy_proxy_auth_origin != ""', { 2331 ['spdy_proxy_auth_origin != ""', {
2330 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2332 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2331 }], 2333 }],
2332 ['spdy_proxy_auth_property != ""', { 2334 ['spdy_proxy_auth_property != ""', {
2333 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2335 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2334 }], 2336 }],
2335 ['spdy_proxy_auth_value != ""', { 2337 ['spdy_proxy_auth_value != ""', {
2336 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2338 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2337 }], 2339 }],
2340 ['data_reduction_proxy_probe_url != ""', {
2341 'defines': [
2342 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2343 }],
2338 ['enable_mdns==1', { 2344 ['enable_mdns==1', {
2339 'defines': ['ENABLE_MDNS=1'], 2345 'defines': ['ENABLE_MDNS=1'],
2340 }] 2346 }]
2341 ], # conditions for 'target_defaults' 2347 ], # conditions for 'target_defaults'
2342 'target_conditions': [ 2348 'target_conditions': [
2343 ['enable_wexit_time_destructors==1', { 2349 ['enable_wexit_time_destructors==1', {
2344 'conditions': [ 2350 'conditions': [
2345 [ 'clang==1', { 2351 [ 'clang==1', {
2346 'cflags': [ 2352 'cflags': [
2347 '-Wexit-time-destructors', 2353 '-Wexit-time-destructors',
(...skipping 2392 matching lines...) Expand 10 before | Expand all | Expand 10 after
4740 # settings in target dicts. SYMROOT is a special case, because many other 4746 # settings in target dicts. SYMROOT is a special case, because many other
4741 # Xcode variables depend on it, including variables such as 4747 # Xcode variables depend on it, including variables such as
4742 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4748 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4743 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4749 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4744 # files to appear (when present) in the UI as actual files and not red 4750 # files to appear (when present) in the UI as actual files and not red
4745 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4751 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4746 # and therefore SYMROOT, needs to be set at the project level. 4752 # and therefore SYMROOT, needs to be set at the project level.
4747 'SYMROOT': '<(DEPTH)/xcodebuild', 4753 'SYMROOT': '<(DEPTH)/xcodebuild',
4748 }, 4754 },
4749 } 4755 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698