| Index: third_party/libjingle/libjingle.gyp
|
| diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
|
| index 4ec4641429eef1e8f64381e15dfd431576529e9e..1ac789beca38a91b154645f1b70227cd44d75f87 100644
|
| --- a/third_party/libjingle/libjingle.gyp
|
| +++ b/third_party/libjingle/libjingle.gyp
|
| @@ -148,6 +148,12 @@
|
| }
|
| },
|
| },
|
| + 'variables': {
|
| + 'clang_warning_flags_unset': [
|
| + # Don't warn about string->bool used in asserts.
|
| + '-Wstring-conversion',
|
| + ],
|
| + },
|
| 'conditions': [
|
| ['"<(libpeer_target_type)"=="static_library"', {
|
| 'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
|
| @@ -193,17 +199,6 @@
|
| }],
|
| ],
|
| }],
|
| - ['clang == 1', {
|
| - 'xcode_settings': {
|
| - 'WARNING_CFLAGS!': [
|
| - # Don't warn about string->bool used in asserts.
|
| - '-Wstring-conversion',
|
| - ],
|
| - },
|
| - 'cflags!': [
|
| - '-Wstring-conversion',
|
| - ],
|
| - }],
|
| ['OS=="linux"', {
|
| 'defines': [
|
| 'LINUX',
|
|
|