diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:16:00 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:16:00 +0100 |
commit | 618be31e3c68ebe00416437f2a816297a1b0fb98 (patch) | |
tree | fd504d4d0c12ae9260ba6b0e68c05f2d210de58a /system_wrappers | |
parent | 4eff397521c1d60004c1862e807d8085c9620bf1 (diff) | |
download | webrtc-618be31e3c68ebe00416437f2a816297a1b0fb98.tar.gz |
Update makefiles after merge of Chromium at 270770
This commit was generated by merge_from_chromium.py.
Change-Id: I8cc5b66e45946bb02401d537bc075914ac435395
Diffstat (limited to 'system_wrappers')
20 files changed, 400 insertions, 48 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk index 8251ee63..8aa16dc0 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk @@ -81,10 +81,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -108,8 +113,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -181,10 +187,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -209,8 +220,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk index 3f939173..b3bb6e28 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk @@ -38,7 +38,6 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -78,10 +77,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' \ @@ -102,8 +106,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -131,7 +136,6 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -171,10 +175,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' \ @@ -196,8 +205,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk index 99041026..b99f6dd5 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk @@ -82,10 +82,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -108,8 +113,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -182,10 +188,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -209,8 +220,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk index f52d63a5..f96fac3b 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk @@ -82,10 +82,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' \ @@ -106,8 +111,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -179,10 +185,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' \ @@ -204,8 +215,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk index 860cb99c..77d6127d 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk @@ -39,7 +39,6 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -82,10 +81,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' \ @@ -106,8 +110,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -136,7 +141,6 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -179,10 +183,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' \ @@ -204,8 +213,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index 8251ee63..8aa16dc0 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -81,10 +81,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -108,8 +113,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -181,10 +187,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -209,8 +220,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk index 3f939173..c9e95b7e 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk @@ -78,10 +78,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' \ @@ -102,8 +107,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -171,10 +177,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' \ @@ -196,8 +207,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk index 99041026..b99f6dd5 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk @@ -82,10 +82,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -108,8 +113,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -182,10 +188,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -209,8 +220,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk index f52d63a5..f96fac3b 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk @@ -82,10 +82,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' \ @@ -106,8 +111,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -179,10 +185,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' \ @@ -204,8 +215,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk index 860cb99c..d3cab632 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk @@ -82,10 +82,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' \ @@ -106,8 +111,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -179,10 +185,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' \ @@ -204,8 +215,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 \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index 4119b212..582d8b5b 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -110,10 +110,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -123,6 +128,12 @@ MY_DEFS_Debug := \ '-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' \ @@ -139,8 +150,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 \ @@ -214,10 +226,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -227,6 +244,12 @@ MY_DEFS_Release := \ '-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' \ @@ -244,8 +267,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 \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk index 12e517cf..2123b2ba 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk @@ -67,7 +67,6 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -107,16 +106,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' \ @@ -133,8 +143,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 \ @@ -164,7 +175,6 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wno-unused-local-typedefs \ -fno-builtin-cos \ -fno-builtin-sin \ -fno-builtin-cosf \ @@ -204,16 +214,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' \ @@ -231,8 +252,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 \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk index 69b6f866..968c52a7 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk @@ -111,10 +111,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -123,6 +128,12 @@ MY_DEFS_Debug := \ '-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' \ @@ -139,8 +150,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 \ @@ -215,10 +227,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -227,6 +244,12 @@ MY_DEFS_Release := \ '-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' \ @@ -244,8 +267,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 \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk index a252e2cd..c95327f8 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk @@ -111,16 +111,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 +148,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 \ @@ -212,16 +224,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 +262,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 \ 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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index 4119b212..582d8b5b 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -110,10 +110,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -123,6 +128,12 @@ MY_DEFS_Debug := \ '-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' \ @@ -139,8 +150,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 \ @@ -214,10 +226,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_ARCH_ARM' \ '-DWEBRTC_ARCH_ARM_V7' \ '-DWEBRTC_DETECT_ARM_NEON' \ @@ -227,6 +244,12 @@ MY_DEFS_Release := \ '-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' \ @@ -244,8 +267,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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm64.mk b/system_wrappers/source/system_wrappers.target.linux-arm64.mk index 12e517cf..f04dc0ef 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm64.mk @@ -107,16 +107,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' \ @@ -133,8 +144,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 \ @@ -204,16 +216,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' \ @@ -231,8 +254,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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index 69b6f866..968c52a7 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -111,10 +111,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -123,6 +128,12 @@ MY_DEFS_Debug := \ '-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' \ @@ -139,8 +150,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 \ @@ -215,10 +227,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' \ '-DMIPS32_LE' \ '-DMIPS_FPU_LE' \ '-DWEBRTC_POSIX' \ @@ -227,6 +244,12 @@ MY_DEFS_Release := \ '-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' \ @@ -244,8 +267,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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index a252e2cd..c95327f8 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -111,16 +111,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 +148,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 \ @@ -212,16 +224,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 +262,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 \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk index 01e09c83..47d48a13 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk @@ -111,16 +111,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 +148,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 \ @@ -212,16 +224,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 +262,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 \ |