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

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: Fixed test 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java » ('j') | 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 441
442 # Platform natively supports discardable memory. 442 # Platform natively supports discardable memory.
443 'native_discardable_memory%': 0, 443 'native_discardable_memory%': 0,
444 444
445 # Platform sends memory pressure signals natively. 445 # Platform sends memory pressure signals natively.
446 'native_memory_pressure_signals%': 0, 446 'native_memory_pressure_signals%': 0,
447 447
448 'spdy_proxy_auth_origin%' : '', 448 'spdy_proxy_auth_origin%' : '',
449 'spdy_proxy_auth_property%' : '', 449 'spdy_proxy_auth_property%' : '',
450 'spdy_proxy_auth_value%' : '', 450 'spdy_proxy_auth_value%' : '',
451 'data_reduction_proxy_probe_url%' : '',
451 'enable_mdns%' : 0, 452 'enable_mdns%' : 0,
452 'enable_enhanced_bookmarks%': 0, 453 'enable_enhanced_bookmarks%': 0,
453 454
454 'conditions': [ 455 'conditions': [
455 # A flag for POSIX platforms 456 # A flag for POSIX platforms
456 ['OS=="win"', { 457 ['OS=="win"', {
457 'os_posix%': 0, 458 'os_posix%': 0,
458 }, { 459 }, {
459 'os_posix%': 1, 460 'os_posix%': 1,
460 }], 461 }],
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 'enable_settings_app%': '<(enable_settings_app)', 894 'enable_settings_app%': '<(enable_settings_app)',
894 'google_api_key%': '<(google_api_key)', 895 'google_api_key%': '<(google_api_key)',
895 'google_default_client_id%': '<(google_default_client_id)', 896 'google_default_client_id%': '<(google_default_client_id)',
896 'google_default_client_secret%': '<(google_default_client_secret)', 897 'google_default_client_secret%': '<(google_default_client_secret)',
897 'enable_managed_users%': '<(enable_managed_users)', 898 'enable_managed_users%': '<(enable_managed_users)',
898 'native_discardable_memory%': '<(native_discardable_memory)', 899 'native_discardable_memory%': '<(native_discardable_memory)',
899 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 900 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
900 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 901 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
901 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 902 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
902 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 903 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
904 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
903 'enable_mdns%' : '<(enable_mdns)', 905 'enable_mdns%' : '<(enable_mdns)',
904 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)', 906 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
905 'v8_optimized_debug': '<(v8_optimized_debug)', 907 'v8_optimized_debug': '<(v8_optimized_debug)',
906 'proprietary_codecs%': '<(proprietary_codecs)', 908 'proprietary_codecs%': '<(proprietary_codecs)',
907 909
908 # Use system nspr instead of the bundled one. 910 # Use system nspr instead of the bundled one.
909 'use_system_nspr%': 0, 911 'use_system_nspr%': 0,
910 912
911 # Use system protobuf instead of bundled one. 913 # Use system protobuf instead of bundled one.
912 'use_system_protobuf%': 0, 914 'use_system_protobuf%': 0,
(...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
2330 }], 2332 }],
2331 ['spdy_proxy_auth_origin != ""', { 2333 ['spdy_proxy_auth_origin != ""', {
2332 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2334 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2333 }], 2335 }],
2334 ['spdy_proxy_auth_property != ""', { 2336 ['spdy_proxy_auth_property != ""', {
2335 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2337 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2336 }], 2338 }],
2337 ['spdy_proxy_auth_value != ""', { 2339 ['spdy_proxy_auth_value != ""', {
2338 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2340 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2339 }], 2341 }],
2342 ['data_reduction_proxy_probe_url != ""', {
2343 'defines': [
2344 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2345 }],
2340 ['enable_mdns==1', { 2346 ['enable_mdns==1', {
2341 'defines': ['ENABLE_MDNS=1'], 2347 'defines': ['ENABLE_MDNS=1'],
2342 }], 2348 }],
2343 ['enable_enhanced_bookmarks==1', { 2349 ['enable_enhanced_bookmarks==1', {
2344 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'], 2350 'defines': ['ENABLE_ENHANCED_BOOKMARKS=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': [
(...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after
4753 # settings in target dicts. SYMROOT is a special case, because many other 4759 # settings in target dicts. SYMROOT is a special case, because many other
4754 # Xcode variables depend on it, including variables such as 4760 # Xcode variables depend on it, including variables such as
4755 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4761 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4756 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4762 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4757 # files to appear (when present) in the UI as actual files and not red 4763 # files to appear (when present) in the UI as actual files and not red
4758 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4764 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4759 # and therefore SYMROOT, needs to be set at the project level. 4765 # and therefore SYMROOT, needs to be set at the project level.
4760 'SYMROOT': '<(DEPTH)/xcodebuild', 4766 'SYMROOT': '<(DEPTH)/xcodebuild',
4761 }, 4767 },
4762 } 4768 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698