diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 00:01:01 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 00:01:01 +0000 |
| commit | 22959a2af36793224724d3b85988db2e40634bd8 (patch) | |
| tree | 2e5e3a6c279b4ca56899aac21defc5ea0be313f5 /libvpx_asm_offsets_vp8.target.darwin-arm.mk | |
| parent | f60f078bf076dfb2fc427c67215a02a5db95a29c (diff) | |
| download | libvpx-22959a2af36793224724d3b85988db2e40634bd8.tar.gz | |
Update makefiles after merge of Chromium at d0b993bb2548
This commit was generated by merge_from_chromium.py.
Change-Id: I22c9c559fb677151ff9f6ae09b01f8190f7a9e59
Diffstat (limited to 'libvpx_asm_offsets_vp8.target.darwin-arm.mk')
| -rw-r--r-- | libvpx_asm_offsets_vp8.target.darwin-arm.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm.mk b/libvpx_asm_offsets_vp8.target.darwin-arm.mk index 4eacb2f..06a6efd 100644 --- a/libvpx_asm_offsets_vp8.target.darwin-arm.mk +++ b/libvpx_asm_offsets_vp8.target.darwin-arm.mk @@ -88,7 +88,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"' \ @@ -193,7 +194,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"' \ |