diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 17:52:29 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 17:52:29 +0000 |
| commit | 199def221b25b21ff515e9cc9e74752b4f4440a5 (patch) | |
| tree | 51ac12953c8bae86bd1f55da3945ca5f53b2b914 /build | |
| parent | 85e92459c27137a7b5aa764e6e4a682aef62bb2f (diff) | |
| download | chromium_src-199def221b25b21ff515e9cc9e74752b4f4440a5.zip chromium_src-199def221b25b21ff515e9cc9e74752b4f4440a5.tar.gz chromium_src-199def221b25b21ff515e9cc9e74752b4f4440a5.tar.bz2 | |
Support spdy proxy origin settings via gyp.
BUG=176057,175895
Review URL: https://chromiumcodereview.appspot.com/12294048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 49c28b9..6ac534d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -404,6 +404,9 @@ # Managed users are enabled by default. 'enable_managed_users%': 1, + 'spdy_proxy_auth_origin%' : '', + 'spdy_proxy_auth_property%' : '', + 'conditions': [ # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of # the 'conditions' clause. Initial attempts resulted in chromium and @@ -740,6 +743,8 @@ 'google_default_client_id%': '<(google_default_client_id)', 'google_default_client_secret%': '<(google_default_client_secret)', 'enable_managed_users%': '<(enable_managed_users)', + 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', + 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', # Use system ffmpeg instead of bundled one. 'use_system_ffmpeg%': 0, @@ -2001,6 +2006,12 @@ ['enable_managed_users==1', { 'defines': ['ENABLE_MANAGED_USERS=1'], }], + ['spdy_proxy_auth_origin != ""', { + 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], + }], + ['spdy_proxy_auth_property != ""', { + 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], + }], ], # conditions for 'target_defaults' 'target_conditions': [ ['enable_wexit_time_destructors==1', { |