From 0889e2e637af905e46b32b7d69847def0f297fca Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 10 Sep 2014 00:01:02 +0000 Subject: Update makefiles after merge of Chromium at d0b993bb2548 This commit was generated by merge_from_chromium.py. Change-Id: I54601e2515cfffcca8e93ac943d9f4f25e35bac9 --- voice_engine/voice_engine.target.darwin-arm.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'voice_engine/voice_engine.target.darwin-arm.mk') diff --git a/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk index 5788e1d4..104e4a35 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -114,7 +114,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"' \ @@ -243,7 +244,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"' \ -- cgit v1.2.3