diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:16:00 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:16:00 +0100 |
| commit | 618be31e3c68ebe00416437f2a816297a1b0fb98 (patch) | |
| tree | fd504d4d0c12ae9260ba6b0e68c05f2d210de58a /modules/video_processing_sse2.target.linux-x86.mk | |
| parent | 4eff397521c1d60004c1862e807d8085c9620bf1 (diff) | |
| download | webrtc-618be31e3c68ebe00416437f2a816297a1b0fb98.tar.gz | |
Update makefiles after merge of Chromium at 270770
This commit was generated by merge_from_chromium.py.
Change-Id: I8cc5b66e45946bb02401d537bc075914ac435395
Diffstat (limited to 'modules/video_processing_sse2.target.linux-x86.mk')
| -rw-r--r-- | modules/video_processing_sse2.target.linux-x86.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/modules/video_processing_sse2.target.linux-x86.mk b/modules/video_processing_sse2.target.linux-x86.mk index 7d512b20..8bdcc1b2 100644 --- a/modules/video_processing_sse2.target.linux-x86.mk +++ b/modules/video_processing_sse2.target.linux-x86.mk @@ -88,10 +88,15 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-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/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DLOGGING_INSIDE_WEBRTC' \ '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ @@ -112,8 +117,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party \ $(LOCAL_PATH) \ + $(LOCAL_PATH)/third_party/webrtc/overrides \ + $(LOCAL_PATH)/third_party \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -190,10 +196,15 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-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/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ '-DWEBRTC_CHROMIUM_BUILD' \ + '-DLOGGING_INSIDE_WEBRTC' \ '-DWEBRTC_POSIX' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ @@ -215,8 +226,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party \ $(LOCAL_PATH) \ + $(LOCAL_PATH)/third_party/webrtc/overrides \ + $(LOCAL_PATH)/third_party \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |