commit 092d7b21d505b8f6f583e7d3e9fc6f64f52e1565
author Android Chromium Automerger <chromium-automerger@android> Wed Sep 10 00:01:00 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Wed Sep 10 00:01:00 2014 +0000
tree 6831bda09dff66ccc700e61ac36b6c0e34066919
parent fdee31349c70d043a81a475bd36ec80dc813efde

Update makefiles after merge of Chromium at d0b993bb2548

This commit was generated by merge_from_chromium.py.

Change-Id: I40878549fbbaa43c0dc6e22c1c5f58398a804ef3

src/translator.target.darwin-arm.mk

diff --git a/src/translator.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk
index a34851f..cf6ffb3 100644
--- a/src/translator.target.darwin-arm.mk
+++ b/src/translator.target.darwin-arm.mk
@@ -89,7 +89,8 @@
 	'-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"' \
@@ -194,7 +195,8 @@
 	'-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"' \