Update makefiles after merge of Chromium at 39.0.2171.26

This commit was generated by merge_from_chromium.py.

Change-Id: Ieeacceb079ec9a3274cb535aa553687a7f48570c

20 files changed, 50 insertions, 110 deletions

diff --git a/base/rtc_base.target.darwin-arm.mk b/base/rtc_base.target.darwin-arm.mk
index 9f4dbecf..f5b6f226 100644
--- a/base/rtc_base.target.darwin-arm.mk
+++ b/base/rtc_base.target.darwin-arm.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -176,7 +174,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -306,7 +303,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.darwin-arm64.mk b/base/rtc_base.target.darwin-arm64.mk
index 24798190..b68a131c 100644
--- a/base/rtc_base.target.darwin-arm64.mk
+++ b/base/rtc_base.target.darwin-arm64.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -162,7 +160,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -277,7 +274,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.darwin-mips.mk b/base/rtc_base.target.darwin-mips.mk
index dae1aeb5..41c64ec3 100644
--- a/base/rtc_base.target.darwin-mips.mk
+++ b/base/rtc_base.target.darwin-mips.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -168,7 +166,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -290,7 +287,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.darwin-x86.mk b/base/rtc_base.target.darwin-x86.mk
index 50369e65..7510b25c 100644
--- a/base/rtc_base.target.darwin-x86.mk
+++ b/base/rtc_base.target.darwin-x86.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -168,7 +166,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -289,7 +286,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.darwin-x86_64.mk b/base/rtc_base.target.darwin-x86_64.mk
index ca8a9f00..708d0f47 100644
--- a/base/rtc_base.target.darwin-x86_64.mk
+++ b/base/rtc_base.target.darwin-x86_64.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -167,7 +165,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -287,7 +284,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.linux-arm.mk b/base/rtc_base.target.linux-arm.mk
index 9f4dbecf..f5b6f226 100644
--- a/base/rtc_base.target.linux-arm.mk
+++ b/base/rtc_base.target.linux-arm.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -176,7 +174,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -306,7 +303,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.linux-arm64.mk b/base/rtc_base.target.linux-arm64.mk
index 24798190..b68a131c 100644
--- a/base/rtc_base.target.linux-arm64.mk
+++ b/base/rtc_base.target.linux-arm64.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -162,7 +160,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -277,7 +274,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.linux-mips.mk b/base/rtc_base.target.linux-mips.mk
index dae1aeb5..41c64ec3 100644
--- a/base/rtc_base.target.linux-mips.mk
+++ b/base/rtc_base.target.linux-mips.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -168,7 +166,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -290,7 +287,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.linux-x86.mk b/base/rtc_base.target.linux-x86.mk
index 50369e65..7510b25c 100644
--- a/base/rtc_base.target.linux-x86.mk
+++ b/base/rtc_base.target.linux-x86.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -168,7 +166,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -289,7 +286,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/base/rtc_base.target.linux-x86_64.mk b/base/rtc_base.target.linux-x86_64.mk
index ca8a9f00..708d0f47 100644
--- a/base/rtc_base.target.linux-x86_64.mk
+++ b/base/rtc_base.target.linux-x86_64.mk
@@ -52,12 +52,6 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/messagequeue.cc \
 	third_party/webrtc/base/nethelpers.cc \
 	third_party/webrtc/base/network.cc \
-	third_party/webrtc/base/nssidentity.cc \
-	third_party/webrtc/base/nssstreamadapter.cc \
-	third_party/webrtc/base/openssladapter.cc \
-	third_party/webrtc/base/openssldigest.cc \
-	third_party/webrtc/base/opensslidentity.cc \
-	third_party/webrtc/base/opensslstreamadapter.cc \
 	third_party/webrtc/base/pathutils.cc \
 	third_party/webrtc/base/physicalsocketserver.cc \
 	third_party/webrtc/base/proxydetect.cc \
@@ -88,7 +82,11 @@ LOCAL_SRC_FILES := \
 	third_party/webrtc/base/unixfilesystem.cc \
 	third_party/webrtc/base/urlencode.cc \
 	third_party/webrtc/base/worker.cc \
-	third_party/webrtc/overrides/webrtc/base/logging.cc
+	third_party/webrtc/overrides/webrtc/base/logging.cc \
+	third_party/webrtc/base/openssladapter.cc \
+	third_party/webrtc/base/openssldigest.cc \
+	third_party/webrtc/base/opensslidentity.cc \
+	third_party/webrtc/base/opensslstreamadapter.cc
 
 
 # Flags passed to both C and C++ files.
@@ -167,7 +165,6 @@ MY_DEFS_Debug := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
@@ -287,7 +284,6 @@ MY_DEFS_Release := \
 	'-DLOGGING=1' \
 	'-DUSE_WEBRTC_DEV_BRANCH' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DUSE_OPENSSL=1' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk
index fb144fb8..65cb34dc 100644
--- a/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk
@@ -116,7 +116,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -244,7 +243,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk
index 20859a07..5f6a5bf3 100644
--- a/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk
@@ -102,7 +102,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -215,7 +214,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk
index 07ffdad4..337e482f 100644
--- a/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -228,7 +227,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk
index f0d70bde..a1f7c8f8 100644
--- a/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -227,7 +226,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk
index 8aac97f8..8fc82972 100644
--- a/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk
@@ -107,7 +107,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -225,7 +224,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk b/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk
index fb144fb8..65cb34dc 100644
--- a/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk
@@ -116,7 +116,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -244,7 +243,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk b/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk
index 20859a07..5f6a5bf3 100644
--- a/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk
@@ -102,7 +102,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -215,7 +214,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk b/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk
index 07ffdad4..337e482f 100644
--- a/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -228,7 +227,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk b/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk
index f0d70bde..a1f7c8f8 100644
--- a/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -227,7 +226,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk b/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk
index 8aac97f8..8fc82972 100644
--- a/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk
+++ b/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk
@@ -107,7 +107,6 @@ MY_DEFS_Debug := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \
@@ -225,7 +224,6 @@ MY_DEFS_Release := \
 	'-DWEBRTC_ANDROID_OPENSLES' \
 	'-DFEATURE_ENABLE_SSL' \
 	'-DNO_MAIN_THREAD_WRAPPING' \
-	'-DSSL_USE_NSS' \
 	'-DSSL_USE_OPENSSL' \
 	'-DHAVE_OPENSSL_SSL_H' \
 	'-DXML_STATIC' \