diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-02 11:04:49 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-02 11:04:49 +0000 |
| commit | 285c0a3feb1252fca4aaaccf28eacddd08ab679a (patch) | |
| tree | 56665c186f0903edf08f2b1b628f1bb85308f7c3 /system_wrappers/source | |
| parent | 95d21956ea7256c2f1c25dace55f9ba16b096258 (diff) | |
| download | webrtc-285c0a3feb1252fca4aaaccf28eacddd08ab679a.tar.gz | |
Update makefiles after merge of Chromium at a804d98340be
This commit was generated by merge_from_chromium.py.
Change-Id: I3ea24c8e7ae11833c39626e51718f28e6ed802d7
Diffstat (limited to 'system_wrappers/source')
10 files changed, 0 insertions, 20 deletions
diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk index 72d2c6ce..92e0c5ee 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk @@ -137,7 +137,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -265,7 +264,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk index 16e3db18..45f652ad 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk @@ -123,7 +123,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -236,7 +235,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk index 90ea5c6a..2c498fc9 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk @@ -129,7 +129,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -249,7 +248,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk index 2312fb8a..4ff19e44 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk @@ -129,7 +129,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -248,7 +247,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ 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 4cd31a47..4d673a80 100644 --- a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk @@ -128,7 +128,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -246,7 +245,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk index 72d2c6ce..92e0c5ee 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk @@ -137,7 +137,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -265,7 +264,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-arm64.mk b/system_wrappers/source/system_wrappers.target.linux-arm64.mk index 16e3db18..45f652ad 100644 --- a/system_wrappers/source/system_wrappers.target.linux-arm64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-arm64.mk @@ -123,7 +123,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -236,7 +235,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk index 90ea5c6a..2c498fc9 100644 --- a/system_wrappers/source/system_wrappers.target.linux-mips.mk +++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk @@ -129,7 +129,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -249,7 +248,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk index 2312fb8a..4ff19e44 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk @@ -129,7 +129,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -248,7 +247,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ 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 4cd31a47..4d673a80 100644 --- a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk +++ b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk @@ -128,7 +128,6 @@ MY_DEFS_Debug := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ @@ -246,7 +245,6 @@ MY_DEFS_Release := \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ '-DFEATURE_ENABLE_SSL' \ - '-DGTEST_RELATIVE_PATH' \ '-DNO_MAIN_THREAD_WRAPPING' \ '-DSSL_USE_NSS' \ '-DSSL_USE_OPENSSL' \ |