1 files changed, 49 insertions, 6 deletions
diff --git a/chromium/third_party/libjingle/source/talk/build/common.gypi b/chromium/third_party/libjingle/source/talk/build/common.gypi
index 50acb39ea95..8261c2085e3 100644
--- a/chromium/third_party/libjingle/source/talk/build/common.gypi
+++ b/chromium/third_party/libjingle/source/talk/build/common.gypi
@@ -46,7 +46,8 @@
   },
   'target_defaults': {
     'include_dirs': [
-      '../..',
+      '<(libjingle_root)',
+      '<(DEPTH)',
       '../../third_party',
       '../../third_party/webrtc',
       '../../webrtc',
@@ -85,6 +86,9 @@
         'conditions': [
           ['clang==1', {
             'cflags': [
+              '-Wall',
+              '-Wextra',
+              '-Wunused-variable',
               # TODO(ronghuawu): Fix the warning caused by
               # LateBindingSymbolTable::TableInfo from
               # latebindingsymboltable.cc.def and remove below flag.
@@ -101,11 +105,10 @@
       ['OS=="ios"', {
         'defines': [
           'IOS',
-          'HAVE_NSS_SSL_H=1',
-          'SSL_USE_NSS_RNG',
         ],
-        'defines!': [
-          'HAVE_OPENSSL_SSL_H=1',
+      }, {
+        'defines': [
+          'HAVE_SCTP',
         ],
       }],
       ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
@@ -114,15 +117,55 @@
         ],
       }],
       ['os_posix==1', {
+        'configurations': {
+          'Debug_Base': {
+            'defines': [
+              # Chromium's build/common.gypi defines this for all posix _except_
+              # for ios & mac.  We want it there as well, e.g. because ASSERT
+              # and friends trigger off of it.
+              '_DEBUG',
+            ],
+          },
+        },
         'defines': [
           'HASH_NAMESPACE=__gnu_cxx',
           'POSIX',
           'DISABLE_DYNAMIC_CAST',
-          'HAVE_OPENSSL_SSL_H=1',
           # The POSIX standard says we have to define this.
           '_REENTRANT',
         ],
       }],
+      # TODO(jiayl): collapse the following 5 defines into 2, one for NSS and
+      # one for OPENSSL, and update the relevant code.
+      ['use_openssl==1', {
+        'defines': [
+          'SSL_USE_OPENSSL',
+          'HAVE_OPENSSL_SSL_H',
+        ],
+        'dependencies': [
+          '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
+        ],
+      }, {
+        'defines': [
+          'SSL_USE_NSS',
+          'HAVE_NSS_SSL_H',
+          'SSL_USE_NSS_RNG',
+        ],
+        'conditions': [
+          ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+            'dependencies': [
+              '<(DEPTH)/build/linux/system.gyp:ssl',
+            ],
+          }],
+          ['OS == "mac" or OS == "ios" or OS == "win"', {
+            'dependencies': [
+              '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
+              '<(DEPTH)/third_party/nss/nss.gyp:nspr',
+              '<(DEPTH)/third_party/nss/nss.gyp:nss',
+            ],
+          }],
+        ],
+      }],
     ],
   }, # target_defaults
 }