summaryrefslogtreecommitdiff
path: root/dl/openmax_dl_armv7.target.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-19 03:36:29 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-19 03:36:29 +0000
commit40230117fae2a85e6dfd29ff181ca6d7b6d197c3 (patch)
tree660ce97a9ce09c6a704538776891676f06c18610 /dl/openmax_dl_armv7.target.linux-arm.mk
parent756620019b8e754df4ff9d82ff09d65f6517ed88 (diff)
downloadopenmax_dl-40230117fae2a85e6dfd29ff181ca6d7b6d197c3.tar.gz
Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py. Change-Id: Ifaf4d0448a3db95fea18c804a3a10212c053c06c
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
-rw-r--r--dl/openmax_dl_armv7.target.linux-arm.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk
index 20330c1..9cb4963 100644
--- a/dl/openmax_dl_armv7.target.linux-arm.mk
+++ b/dl/openmax_dl_armv7.target.linux-arm.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_DEV_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"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -201,6 +202,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_DEV_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"' \
'-DVIDEO_HOLE=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \