diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 00:01:02 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 00:01:02 +0000 |
| commit | 0889e2e637af905e46b32b7d69847def0f297fca (patch) | |
| tree | 137bec5f7b51d0db8cf2c7ab5e16464b53a702ca /modules/audio_coding_module.target.linux-x86_64.mk | |
| parent | 40220194bb03637cbc5b21ef36b6abd4e20cbd75 (diff) | |
| download | webrtc-0889e2e637af905e46b32b7d69847def0f297fca.tar.gz | |
Update makefiles after merge of Chromium at d0b993bb2548
This commit was generated by merge_from_chromium.py.
Change-Id: I54601e2515cfffcca8e93ac943d9f4f25e35bac9
Diffstat (limited to 'modules/audio_coding_module.target.linux-x86_64.mk')
| -rw-r--r-- | modules/audio_coding_module.target.linux-x86_64.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/audio_coding_module.target.linux-x86_64.mk b/modules/audio_coding_module.target.linux-x86_64.mk index ca89ae57..0909410f 100644 --- a/modules/audio_coding_module.target.linux-x86_64.mk +++ b/modules/audio_coding_module.target.linux-x86_64.mk @@ -115,7 +115,8 @@ MY_DEFS_Debug := \ '-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/"' \ + '-DDATA_REDUCTION_DEV_HOST="https://proxy-dev.googlezip.net:443/"' \ + '-DDATA_REDUCTION_DEV_FALLBACK_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"' \ @@ -246,7 +247,8 @@ MY_DEFS_Release := \ '-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/"' \ + '-DDATA_REDUCTION_DEV_HOST="https://proxy-dev.googlezip.net:443/"' \ + '-DDATA_REDUCTION_DEV_FALLBACK_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"' \ |