commit 189579931d17d3e567cd2ecfe56abc0be3e20bac
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Aug 11 21:06:30 2014 +0000
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Aug 11 21:06:30 2014 +0000
tree c6c065a6792ddf4f5ee2d1d898a6a013476c6845
parent b20d54112730e5eeb7e8968258763326bd75c1ee

Remove more dependencies on openssl, add dependency on boringssl. Continues on r6798

R=andrew@webrtc.org, fbarchard@chromium.org, kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14029004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6867 4adac7df-926f-26a2-2b94-8c16560cd09d

build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi
index 5e24c1b..57b21af 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -65,15 +65,10 @@
       'FEATURE_ENABLE_SSL',
       'FEATURE_ENABLE_VOICEMAIL',
       'FEATURE_ENABLE_PSTN',
-      # TODO(eric): enable HAVE_NSS_SSL_H and SSL_USE_NSS once they are ready.
-      # 'HAVE_NSS_SSL_H=1',
       'HAVE_SCTP',
       'HAVE_SRTP',
       'HAVE_WEBRTC_VIDEO',
       'HAVE_WEBRTC_VOICE',
-      # 'SSL_USE_NSS',
-      # TODO(ronghuawu): Remove this once libjingle is updated to use the new
-      # webrtc.
       'USE_WEBRTC_DEV_BRANCH',
     ],
     'conditions': [
@@ -149,37 +144,6 @@
           '_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
 }