summaryrefslogtreecommitdiff
path: root/modules/video_processing_sse2.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-19 03:36:33 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-19 03:36:33 +0000
commitad3bcf43404f06080840b0787fad7a394e7925d8 (patch)
tree3d1120eccd26aef4ef62f752545403812caa6666 /modules/video_processing_sse2.target.linux-x86.mk
parent5c28a0a23c4b04c44d7b1a5db4903f4e5ee18ff9 (diff)
downloadwebrtc-ad3bcf43404f06080840b0787fad7a394e7925d8.tar.gz
Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py. Change-Id: I2e09453759ef2a9b23eb8b2cf0d92f70acc3ea89
Diffstat (limited to 'modules/video_processing_sse2.target.linux-x86.mk')
-rw-r--r--modules/video_processing_sse2.target.linux-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/video_processing_sse2.target.linux-x86.mk b/modules/video_processing_sse2.target.linux-x86.mk
index b8287a8e..b583c819 100644
--- a/modules/video_processing_sse2.target.linux-x86.mk
+++ b/modules/video_processing_sse2.target.linux-x86.mk
@@ -94,6 +94,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' \
'-DWEBRTC_RESTRICT_LOGGING' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
@@ -205,6 +206,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' \
'-DWEBRTC_RESTRICT_LOGGING' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \