diff options
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk')
-rw-r--r-- | system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk | 18 |
1 files changed, 14 insertions, 4 deletions
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 |