Update makefiles after merge of Chromium at 270770
This commit was generated by merge_from_chromium.py.
Change-Id: I8cc5b66e45946bb02401d537bc075914ac435395
diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk
index b9864e2..f126471 100644
--- a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk
@@ -84,10 +84,15 @@
'-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' \
@@ -108,8 +113,9 @@
# 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 \
$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -182,10 +188,15 @@
'-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' \
@@ -207,8 +218,9 @@
# 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 \
$(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \