diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-12 13:47:38 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-08-12 13:47:38 +0100 |
| commit | 5f1c94371a64b3196d4be9466099bb892df9b88e (patch) | |
| tree | 60a287ed27d1328d7806d12433d789b66ad91805 /jingle/jingle_glue.target.darwin-arm64.mk | |
| parent | 43165a58c6167882aabb62f470c4e4d21f807d79 (diff) | |
| download | chromium_org-5f1c94371a64b3196d4be9466099bb892df9b88e.tar.gz | |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
Diffstat (limited to 'jingle/jingle_glue.target.darwin-arm64.mk')
| -rw-r--r-- | jingle/jingle_glue.target.darwin-arm64.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/jingle/jingle_glue.target.darwin-arm64.mk b/jingle/jingle_glue.target.darwin-arm64.mk index 652d75b4b3..40f4e4a8aa 100644 --- a/jingle/jingle_glue.target.darwin-arm64.mk +++ b/jingle/jingle_glue.target.darwin-arm64.mk @@ -81,7 +81,6 @@ MY_DEFS_Debug := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ - '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -99,6 +98,7 @@ MY_DEFS_Debug := \ '-DNO_SOUND_SYSTEM' \ '-DANDROID' \ '-DPOSIX' \ + '-DWEBRTC_POSIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -119,12 +119,11 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ + $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ - $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/testing/gtest/include \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/webrtc \ $(PWD)/external/expat/lib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -190,7 +189,6 @@ MY_DEFS_Release := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ - '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -208,6 +206,7 @@ MY_DEFS_Release := \ '-DNO_SOUND_SYSTEM' \ '-DANDROID' \ '-DPOSIX' \ + '-DWEBRTC_POSIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -229,12 +228,11 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ + $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ - $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/testing/gtest/include \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/webrtc \ $(PWD)/external/expat/lib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ |