diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 00:01:00 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 00:01:00 +0000 |
commit | ea9b5441a4c939a26c9f0520b2d9b6a4c6b75e00 (patch) | |
tree | a8683ef4eff28b2f650ed95479553397ff45f560 /ft2.target.darwin-x86_64.mk | |
parent | 2ae2275db3a454962205bf35360a47772112b4dd (diff) | |
download | freetype-ea9b5441a4c939a26c9f0520b2d9b6a4c6b75e00.tar.gz |
Update makefiles after merge of Chromium at d0b993bb2548
This commit was generated by merge_from_chromium.py.
Change-Id: I21761e3ba5e85547179716cc3fe7b691418d64cd
Diffstat (limited to 'ft2.target.darwin-x86_64.mk')
-rw-r--r-- | ft2.target.darwin-x86_64.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index f0cc055..34691e8 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -101,7 +101,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"' \ @@ -205,7 +206,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"' \ |