From 618be31e3c68ebe00416437f2a816297a1b0fb98 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Fri, 16 May 2014 13:16:00 +0100 Subject: Update makefiles after merge of Chromium at 270770 This commit was generated by merge_from_chromium.py. Change-Id: I8cc5b66e45946bb02401d537bc075914ac435395 --- modules/CNG.target.darwin-x86.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'modules/CNG.target.darwin-x86.mk') diff --git a/modules/CNG.target.darwin-x86.mk b/modules/CNG.target.darwin-x86.mk index c7b6c609..8ed59363 100644 --- a/modules/CNG.target.darwin-x86.mk +++ b/modules/CNG.target.darwin-x86.mk @@ -87,10 +87,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' \ @@ -111,8 +116,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 \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ @@ -193,10 +199,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' \ @@ -218,8 +229,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 \ $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \ $(LOCAL_PATH)/third_party/webrtc \ $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \ -- cgit v1.2.3