diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:15:59 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:15:59 +0100 |
commit | deafe80bd7094c268e81edcea7015bc08535b5de (patch) | |
tree | ad04e4ef1fcfa08f8ee1d283863c192a9c78c03b /libvpx.target.linux-x86_64.mk | |
parent | 80bc6f5eb8065006f1997be0fbf429efbb748df8 (diff) | |
download | libvpx-deafe80bd7094c268e81edcea7015bc08535b5de.tar.gz |
Update makefiles after merge of Chromium at 270770
This commit was generated by merge_from_chromium.py.
Change-Id: I092cf3484839224e780f7bf93a597c825a2bdd07
Diffstat (limited to 'libvpx.target.linux-x86_64.mk')
-rw-r--r-- | libvpx.target.linux-x86_64.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk index 8ce85d9..a0c605e 100644 --- a/libvpx.target.linux-x86_64.mk +++ b/libvpx.target.linux-x86_64.mk @@ -890,6 +890,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-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"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -983,6 +987,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-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"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ |