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 | ffd3d63ff7a494166174a2fa833ea65cbac50695 (patch) | |
| tree | 8969a7805389499df1b3b6f34f2a6102601b1d1b /dl/openmax_dl_armv7.target.linux-arm.mk | |
| parent | a008d4b4dc60d3c8a6262d07fc75459d1fdd9062 (diff) | |
| download | openmax_dl-ffd3d63ff7a494166174a2fa833ea65cbac50695.tar.gz | |
Update makefiles after merge of Chromium at d0b993bb2548
This commit was generated by merge_from_chromium.py.
Change-Id: I8daa231bc5d1a1aa9b1d1c0cc00cd724794ae5d0
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 6a9135d..ab72d2a 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -97,7 +97,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"' \ @@ -200,7 +201,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"' \ |