summaryrefslogtreecommitdiff
path: root/libvpx_intrinsics_neon.target.darwin-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-19 03:36:28 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-19 03:36:28 +0000
commitd77dc4514a925c51ea9a72901526e45e361f55c8 (patch)
tree0e86f67963fff6a3717c58756fe39bf617e693be /libvpx_intrinsics_neon.target.darwin-arm.mk
parentb68b69450259b5e317e989b0331c1ac97af9bb9c (diff)
downloadlibvpx-d77dc4514a925c51ea9a72901526e45e361f55c8.tar.gz
Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py. Change-Id: I9bfb469bc75cc2b0700248da68b706dc0651ceb3
Diffstat (limited to 'libvpx_intrinsics_neon.target.darwin-arm.mk')
-rw-r--r--libvpx_intrinsics_neon.target.darwin-arm.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvpx_intrinsics_neon.target.darwin-arm.mk b/libvpx_intrinsics_neon.target.darwin-arm.mk
index 49b1eb8..f953356 100644
--- a/libvpx_intrinsics_neon.target.darwin-arm.mk
+++ b/libvpx_intrinsics_neon.target.darwin-arm.mk
@@ -111,6 +111,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' \
@@ -213,6 +214,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' \