diff options
Diffstat (limited to 'system_wrappers/source/system_wrappers.target.darwin-x86_64.mk')
| -rw-r--r-- | system_wrappers/source/system_wrappers.target.darwin-x86_64.mk | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk index 01e09c83..72ac93fb 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk @@ -68,7 +68,6 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -111,16 +110,27 @@ 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' \ '-DWEBRTC_ANDROID_OPENSLES' \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ + '-DFEATURE_ENABLE_SSL' \ + '-DGTEST_RELATIVE_PATH' \ + '-DNO_MAIN_THREAD_WRAPPING' \ + '-DSSL_USE_NSS' \ + '-DSSL_USE_OPENSSL' \ + '-DHAVE_OPENSSL_SSL_H' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -137,8 +147,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/system_wrappers/source/spreadsortlib \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(PWD)/frameworks/wilhelm/include \ @@ -169,7 +180,6 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -212,16 +222,27 @@ 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' \ '-DWEBRTC_ANDROID_OPENSLES' \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ + '-DFEATURE_ENABLE_SSL' \ + '-DGTEST_RELATIVE_PATH' \ + '-DNO_MAIN_THREAD_WRAPPING' \ + '-DSSL_USE_NSS' \ + '-DSSL_USE_OPENSSL' \ + '-DHAVE_OPENSSL_SSL_H' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -239,8 +260,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/system_wrappers/source/spreadsortlib \ $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \ $(PWD)/frameworks/wilhelm/include \ |