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

Side by Side Diff: build/common.gypi

Issue 14994003: Remove round trip from data reduction proxy authentication (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added data reduction proxy initialization logic Created 7 years, 7 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 | Annotate | Revision Log
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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 'test_isolation_fail_on_missing': 0, 401 'test_isolation_fail_on_missing': 0,
402 402
403 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86', 403 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
404 'wix_path%': '<(DEPTH)/third_party/wix', 404 'wix_path%': '<(DEPTH)/third_party/wix',
405 405
406 # Managed users are enabled by default. 406 # Managed users are enabled by default.
407 'enable_managed_users%': 1, 407 'enable_managed_users%': 1,
408 408
409 'spdy_proxy_auth_origin%' : '', 409 'spdy_proxy_auth_origin%' : '',
410 'spdy_proxy_auth_property%' : '', 410 'spdy_proxy_auth_property%' : '',
411 'spdy_proxy_auth_value%' : '',
411 412
412 'conditions': [ 413 'conditions': [
413 # A flag for POSIX platforms 414 # A flag for POSIX platforms
414 ['OS=="win"', { 415 ['OS=="win"', {
415 'os_posix%': 0, 416 'os_posix%': 0,
416 }, { 417 }, {
417 'os_posix%': 1, 418 'os_posix%': 1,
418 }], 419 }],
419 420
420 # A flag for BSD platforms 421 # A flag for BSD platforms
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 'enable_app_list%': '<(enable_app_list)', 798 'enable_app_list%': '<(enable_app_list)',
798 'use_default_render_theme%': '<(use_default_render_theme)', 799 'use_default_render_theme%': '<(use_default_render_theme)',
799 'enable_settings_app%': '<(enable_settings_app)', 800 'enable_settings_app%': '<(enable_settings_app)',
800 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 801 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
801 'google_api_key%': '<(google_api_key)', 802 'google_api_key%': '<(google_api_key)',
802 'google_default_client_id%': '<(google_default_client_id)', 803 'google_default_client_id%': '<(google_default_client_id)',
803 'google_default_client_secret%': '<(google_default_client_secret)', 804 'google_default_client_secret%': '<(google_default_client_secret)',
804 'enable_managed_users%': '<(enable_managed_users)', 805 'enable_managed_users%': '<(enable_managed_users)',
805 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 806 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
806 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 807 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
808 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
807 809
808 # Use system mesa instead of bundled one. 810 # Use system mesa instead of bundled one.
809 'use_system_mesa%': 0, 811 'use_system_mesa%': 0,
810 812
811 # Use system nspr instead of the bundled one. 813 # Use system nspr instead of the bundled one.
812 'use_system_nspr%': 0, 814 'use_system_nspr%': 0,
813 815
814 # Use system protobuf instead of bundled one. 816 # Use system protobuf instead of bundled one.
815 'use_system_protobuf%': 0, 817 'use_system_protobuf%': 0,
816 818
(...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
2184 }], 2186 }],
2185 ['enable_managed_users==1', { 2187 ['enable_managed_users==1', {
2186 'defines': ['ENABLE_MANAGED_USERS=1'], 2188 'defines': ['ENABLE_MANAGED_USERS=1'],
2187 }], 2189 }],
2188 ['spdy_proxy_auth_origin != ""', { 2190 ['spdy_proxy_auth_origin != ""', {
2189 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2191 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2190 }], 2192 }],
2191 ['spdy_proxy_auth_property != ""', { 2193 ['spdy_proxy_auth_property != ""', {
2192 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2194 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2193 }], 2195 }],
2196 ['spdy_proxy_auth_value != ""', {
2197 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2198 }],
2194 ['enable_mdns==1', { 2199 ['enable_mdns==1', {
2195 'defines': ['ENABLE_MDNS=1'], 2200 'defines': ['ENABLE_MDNS=1'],
2196 }] 2201 }]
2197 ], # conditions for 'target_defaults' 2202 ], # conditions for 'target_defaults'
2198 'target_conditions': [ 2203 'target_conditions': [
2199 ['enable_wexit_time_destructors==1', { 2204 ['enable_wexit_time_destructors==1', {
2200 'conditions': [ 2205 'conditions': [
2201 [ 'clang==1', { 2206 [ 'clang==1', {
2202 'cflags': [ 2207 'cflags': [
2203 '-Wexit-time-destructors', 2208 '-Wexit-time-destructors',
(...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after
4444 # settings in target dicts. SYMROOT is a special case, because many other 4449 # settings in target dicts. SYMROOT is a special case, because many other
4445 # Xcode variables depend on it, including variables such as 4450 # Xcode variables depend on it, including variables such as
4446 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4451 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4447 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4452 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4448 # files to appear (when present) in the UI as actual files and not red 4453 # files to appear (when present) in the UI as actual files and not red
4449 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4454 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4450 # and therefore SYMROOT, needs to be set at the project level. 4455 # and therefore SYMROOT, needs to be set at the project level.
4451 'SYMROOT': '<(DEPTH)/xcodebuild', 4456 'SYMROOT': '<(DEPTH)/xcodebuild',
4452 }, 4457 },
4453 } 4458 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698