summaryrefslogtreecommitdiff
path: root/libvpx_obj_int_extract.host.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 04:36:36 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 04:36:36 +0000
commitdf3bc9a9a10271260abc27f711f9d5cb312e315c (patch)
tree222f68ec00a3c886c7db8f8a13ee133118c878e7 /libvpx_obj_int_extract.host.linux-x86.mk
parent7d4ca34d79399e48fd3e391b035c3a43ceeb28ca (diff)
downloadlibvpx-df3bc9a9a10271260abc27f711f9d5cb312e315c.tar.gz
Update makefiles after merge of Chromium at 269030
This commit was generated by merge_from_chromium.py. Change-Id: I7d716ccfc9064eff344bdb8cf024fbfb7e6af680
Diffstat (limited to 'libvpx_obj_int_extract.host.linux-x86.mk')
-rw-r--r--libvpx_obj_int_extract.host.linux-x86.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk
index 839522a..13fb59d 100644
--- a/libvpx_obj_int_extract.host.linux-x86.mk
+++ b/libvpx_obj_int_extract.host.linux-x86.mk
@@ -64,6 +64,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFORCE_PARSE_ELF' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -125,6 +127,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFORCE_PARSE_ELF' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \