commit 618be31e3c68ebe00416437f2a816297a1b0fb98
author Torne (Richard Coles) <torne@google.com> Fri May 16 13:16:00 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Fri May 16 13:16:00 2014 +0100
tree fd504d4d0c12ae9260ba6b0e68c05f2d210de58a
parent 4eff397521c1d60004c1862e807d8085c9620bf1

Update makefiles after merge of Chromium at 270770

This commit was generated by merge_from_chromium.py.

Change-Id: I8cc5b66e45946bb02401d537bc075914ac435395

modules/iSACFix.target.darwin-arm.mk

diff --git a/modules/iSACFix.target.darwin-arm.mk b/modules/iSACFix.target.darwin-arm.mk
index 85329f0..b507b45 100644
--- a/modules/iSACFix.target.darwin-arm.mk
+++ b/modules/iSACFix.target.darwin-arm.mk
@@ -110,10 +110,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' \
@@ -137,8 +142,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/isac/fix/interface \
 	$(LOCAL_PATH)/third_party/webrtc \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
@@ -220,10 +226,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' \
@@ -248,8 +259,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/isac/fix/interface \
 	$(LOCAL_PATH)/third_party/webrtc \
 	$(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \