diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:31:42 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:31:42 +0100 |
| commit | 56aeae9b065578e56222618886ef0e42488397e2 (patch) | |
| tree | 96c32febb356465e7f7b0e20b901c9726be0982a /openssl.target.linux-x86_64.mk | |
| parent | 90e5a593cc6df2f5eb3ceca723b63f6eef1ea156 (diff) | |
| parent | 4f17781540e08047f7cee3b0af41639fa8c1e3dd (diff) | |
| download | openssl-56aeae9b065578e56222618886ef0e42488397e2.tar.gz | |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: I88982c1c25f25ef846e6bda10aececd98d25d2c1
Diffstat (limited to 'openssl.target.linux-x86_64.mk')
| -rw-r--r-- | openssl.target.linux-x86_64.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 1d79fe8..95d3124 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -649,6 +649,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ + '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ @@ -765,6 +766,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ + '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ |