Update makefiles after merge of Chromium at 270770
This commit was generated by merge_from_chromium.py.
Change-Id: I8cc5b66e45946bb02401d537bc075914ac435395
diff --git a/modules/PCM16B.target.linux-arm.mk b/modules/PCM16B.target.linux-arm.mk
index e273bbf..c7641e6 100644
--- a/modules/PCM16B.target.linux-arm.mk
+++ b/modules/PCM16B.target.linux-arm.mk
@@ -85,10 +85,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_ARCH_ARM' \
'-DWEBRTC_ARCH_ARM_V7' \
'-DWEBRTC_DETECT_ARM_NEON' \
@@ -112,8 +117,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/modules/audio_coding/codecs/pcm16b/include \
$(LOCAL_PATH)/third_party/webrtc \
$(PWD)/frameworks/wilhelm/include \
@@ -191,10 +197,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_ARCH_ARM' \
'-DWEBRTC_ARCH_ARM_V7' \
'-DWEBRTC_DETECT_ARM_NEON' \
@@ -219,8 +230,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/modules/audio_coding/codecs/pcm16b/include \
$(LOCAL_PATH)/third_party/webrtc \
$(PWD)/frameworks/wilhelm/include \