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

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: Another round of comments addressed 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 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 'enable_settings_app%': '<(enable_settings_app)', 890 'enable_settings_app%': '<(enable_settings_app)',
890 'google_api_key%': '<(google_api_key)', 891 'google_api_key%': '<(google_api_key)',
891 'google_default_client_id%': '<(google_default_client_id)', 892 'google_default_client_id%': '<(google_default_client_id)',
892 'google_default_client_secret%': '<(google_default_client_secret)', 893 'google_default_client_secret%': '<(google_default_client_secret)',
893 'enable_managed_users%': '<(enable_managed_users)', 894 'enable_managed_users%': '<(enable_managed_users)',
894 'native_discardable_memory%': '<(native_discardable_memory)', 895 'native_discardable_memory%': '<(native_discardable_memory)',
895 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 896 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
896 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 897 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
897 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 898 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
898 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 899 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
900 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
899 'enable_mdns%' : '<(enable_mdns)', 901 'enable_mdns%' : '<(enable_mdns)',
900 'v8_optimized_debug': '<(v8_optimized_debug)', 902 'v8_optimized_debug': '<(v8_optimized_debug)',
901 'proprietary_codecs%': '<(proprietary_codecs)', 903 'proprietary_codecs%': '<(proprietary_codecs)',
902 904
903 # Use system nspr instead of the bundled one. 905 # Use system nspr instead of the bundled one.
904 'use_system_nspr%': 0, 906 'use_system_nspr%': 0,
905 907
906 # Use system protobuf instead of bundled one. 908 # Use system protobuf instead of bundled one.
907 'use_system_protobuf%': 0, 909 'use_system_protobuf%': 0,
908 910
(...skipping 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after
2333 }], 2335 }],
2334 ['spdy_proxy_auth_origin != ""', { 2336 ['spdy_proxy_auth_origin != ""', {
2335 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2337 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2336 }], 2338 }],
2337 ['spdy_proxy_auth_property != ""', { 2339 ['spdy_proxy_auth_property != ""', {
2338 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2340 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2339 }], 2341 }],
2340 ['spdy_proxy_auth_value != ""', { 2342 ['spdy_proxy_auth_value != ""', {
2341 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2343 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2342 }], 2344 }],
2345 ['data_reduction_proxy_probe_url != ""', {
2346 'defines': [
2347 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2348 }],
2343 ['enable_mdns==1', { 2349 ['enable_mdns==1', {
2344 'defines': ['ENABLE_MDNS=1'], 2350 'defines': ['ENABLE_MDNS=1'],
2345 }] 2351 }]
2346 ], # conditions for 'target_defaults' 2352 ], # conditions for 'target_defaults'
2347 'target_conditions': [ 2353 'target_conditions': [
2348 ['enable_wexit_time_destructors==1', { 2354 ['enable_wexit_time_destructors==1', {
2349 'conditions': [ 2355 'conditions': [
2350 [ 'clang==1', { 2356 [ 'clang==1', {
2351 'cflags': [ 2357 'cflags': [
2352 '-Wexit-time-destructors', 2358 '-Wexit-time-destructors',
(...skipping 2392 matching lines...) Expand 10 before | Expand all | Expand 10 after
4745 # settings in target dicts. SYMROOT is a special case, because many other 4751 # settings in target dicts. SYMROOT is a special case, because many other
4746 # Xcode variables depend on it, including variables such as 4752 # Xcode variables depend on it, including variables such as
4747 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4753 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4748 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4754 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4749 # files to appear (when present) in the UI as actual files and not red 4755 # files to appear (when present) in the UI as actual files and not red
4750 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4756 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4751 # and therefore SYMROOT, needs to be set at the project level. 4757 # and therefore SYMROOT, needs to be set at the project level.
4752 'SYMROOT': '<(DEPTH)/xcodebuild', 4758 'SYMROOT': '<(DEPTH)/xcodebuild',
4753 }, 4759 },
4754 } 4760 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698