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

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: Fixed gyp issues 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
« no previous file with comments | « no previous file | chrome/android/testshell/chrome_data_reduction_proxy_testshell_android.cc » ('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 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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 'google_tv%': '<(google_tv)', 808 'google_tv%': '<(google_tv)',
808 'enable_app_list%': '<(enable_app_list)', 809 'enable_app_list%': '<(enable_app_list)',
809 'use_default_render_theme%': '<(use_default_render_theme)', 810 'use_default_render_theme%': '<(use_default_render_theme)',
810 'enable_settings_app%': '<(enable_settings_app)', 811 'enable_settings_app%': '<(enable_settings_app)',
811 'google_api_key%': '<(google_api_key)', 812 'google_api_key%': '<(google_api_key)',
812 'google_default_client_id%': '<(google_default_client_id)', 813 'google_default_client_id%': '<(google_default_client_id)',
813 'google_default_client_secret%': '<(google_default_client_secret)', 814 'google_default_client_secret%': '<(google_default_client_secret)',
814 'enable_managed_users%': '<(enable_managed_users)', 815 'enable_managed_users%': '<(enable_managed_users)',
815 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 816 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
816 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 817 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
818 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
817 819
818 # Use system mesa instead of bundled one. 820 # Use system mesa instead of bundled one.
819 'use_system_mesa%': 0, 821 'use_system_mesa%': 0,
820 822
821 # Use system nspr instead of the bundled one. 823 # Use system nspr instead of the bundled one.
822 'use_system_nspr%': 0, 824 'use_system_nspr%': 0,
823 825
824 # Use system protobuf instead of bundled one. 826 # Use system protobuf instead of bundled one.
825 'use_system_protobuf%': 0, 827 'use_system_protobuf%': 0,
826 828
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 }], 2181 }],
2180 ['enable_managed_users==1', { 2182 ['enable_managed_users==1', {
2181 'defines': ['ENABLE_MANAGED_USERS=1'], 2183 'defines': ['ENABLE_MANAGED_USERS=1'],
2182 }], 2184 }],
2183 ['spdy_proxy_auth_origin != ""', { 2185 ['spdy_proxy_auth_origin != ""', {
2184 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2186 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2185 }], 2187 }],
2186 ['spdy_proxy_auth_property != ""', { 2188 ['spdy_proxy_auth_property != ""', {
2187 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2189 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2188 }], 2190 }],
2191 ['spdy_proxy_auth_value != ""', {
2192 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2193 }],
2189 ['enable_mdns==1', { 2194 ['enable_mdns==1', {
2190 'defines': ['ENABLE_MDNS=1'], 2195 'defines': ['ENABLE_MDNS=1'],
2191 }] 2196 }]
2192 ], # conditions for 'target_defaults' 2197 ], # conditions for 'target_defaults'
2193 'target_conditions': [ 2198 'target_conditions': [
2194 ['enable_wexit_time_destructors==1', { 2199 ['enable_wexit_time_destructors==1', {
2195 'conditions': [ 2200 'conditions': [
2196 [ 'clang==1', { 2201 [ 'clang==1', {
2197 'cflags': [ 2202 'cflags': [
2198 '-Wexit-time-destructors', 2203 '-Wexit-time-destructors',
(...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after
4439 # settings in target dicts. SYMROOT is a special case, because many other 4444 # settings in target dicts. SYMROOT is a special case, because many other
4440 # Xcode variables depend on it, including variables such as 4445 # Xcode variables depend on it, including variables such as
4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4446 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4447 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4443 # files to appear (when present) in the UI as actual files and not red 4448 # files to appear (when present) in the UI as actual files and not red
4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4449 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4445 # and therefore SYMROOT, needs to be set at the project level. 4450 # and therefore SYMROOT, needs to be set at the project level.
4446 'SYMROOT': '<(DEPTH)/xcodebuild', 4451 'SYMROOT': '<(DEPTH)/xcodebuild',
4447 }, 4452 },
4448 } 4453 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/testshell/chrome_data_reduction_proxy_testshell_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698