From 7f3b134905a4cd28867fb0cfee17a492e16fea4a Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 10 Sep 2014 00:01:00 +0000 Subject: Update makefiles after merge of Chromium at d0b993bb2548 This commit was generated by merge_from_chromium.py. Change-Id: I6c4404d42b985e21201b13efb65ee9ff71bbb58d --- icuuc.target.linux-x86_64.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'icuuc.target.linux-x86_64.mk') diff --git a/icuuc.target.linux-x86_64.mk b/icuuc.target.linux-x86_64.mk index 6e738f1..e6a0f8f 100644 --- a/icuuc.target.linux-x86_64.mk +++ b/icuuc.target.linux-x86_64.mk @@ -257,7 +257,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"' \ @@ -363,7 +364,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