| Index: webrtc/base/base.gyp
|
| diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
|
| index 1536b4f8b96cce5ccab2d6fbbebe61a065974007..b111dacfd94a8ab100b2e153e96cbdf061bbad21 100644
|
| --- a/webrtc/base/base.gyp
|
| +++ b/webrtc/base/base.gyp
|
| @@ -104,6 +104,8 @@
|
| ],
|
| 'defines': [
|
| 'FEATURE_ENABLE_SSL',
|
| + 'SSL_USE_OPENSSL',
|
| + 'HAVE_OPENSSL_SSL_H',
|
| 'LOGGING=1',
|
| ],
|
| 'sources': [
|
| @@ -220,6 +222,15 @@
|
| 'network.cc',
|
| 'network.h',
|
| 'nullsocketserver.h',
|
| + 'openssl.h',
|
| + 'openssladapter.cc',
|
| + 'openssladapter.h',
|
| + 'openssldigest.cc',
|
| + 'openssldigest.h',
|
| + 'opensslidentity.cc',
|
| + 'opensslidentity.h',
|
| + 'opensslstreamadapter.cc',
|
| + 'opensslstreamadapter.h',
|
| 'optionsfile.cc',
|
| 'optionsfile.h',
|
| 'pathutils.cc',
|
| @@ -357,6 +368,8 @@
|
| ],
|
| 'defines': [
|
| 'FEATURE_ENABLE_SSL',
|
| + 'SSL_USE_OPENSSL',
|
| + 'HAVE_OPENSSL_SSL_H',
|
| ],
|
| },
|
| 'include_dirs': [
|
| @@ -486,85 +499,6 @@
|
| '../overrides/webrtc/base/logging.h',
|
| ],
|
| }],
|
| - ['use_openssl==1', {
|
| - 'defines': [
|
| - 'SSL_USE_OPENSSL',
|
| - 'HAVE_OPENSSL_SSL_H',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'SSL_USE_OPENSSL',
|
| - 'HAVE_OPENSSL_SSL_H',
|
| - ],
|
| - },
|
| - 'sources': [
|
| - 'openssl.h',
|
| - 'openssladapter.cc',
|
| - 'openssladapter.h',
|
| - 'openssldigest.cc',
|
| - 'openssldigest.h',
|
| - 'opensslidentity.cc',
|
| - 'opensslidentity.h',
|
| - 'opensslstreamadapter.cc',
|
| - 'opensslstreamadapter.h',
|
| - ],
|
| - 'conditions': [
|
| - ['build_ssl==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
|
| - ],
|
| - }, {
|
| - 'include_dirs': [
|
| - '<(ssl_root)',
|
| - ],
|
| - }],
|
| - ],
|
| - }, {
|
| - 'sources': [
|
| - 'nssidentity.cc',
|
| - 'nssidentity.h',
|
| - 'nssstreamadapter.cc',
|
| - 'nssstreamadapter.h',
|
| - ],
|
| - 'conditions': [
|
| - ['use_legacy_ssl_defaults!=1', {
|
| - 'defines': [
|
| - 'SSL_USE_NSS',
|
| - 'HAVE_NSS_SSL_H',
|
| - 'SSL_USE_NSS_RNG',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'SSL_USE_NSS',
|
| - 'HAVE_NSS_SSL_H',
|
| - 'SSL_USE_NSS_RNG',
|
| - ],
|
| - },
|
| - }],
|
| - ['build_ssl==1', {
|
| - 'conditions': [
|
| - # On some platforms, the rest of NSS is bundled. On others,
|
| - # it's pulled from the system.
|
| - ['OS == "mac" or OS == "ios"', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
|
| - '<(DEPTH)/third_party/nss/nss.gyp:nspr',
|
| - '<(DEPTH)/third_party/nss/nss.gyp:nss',
|
| - ],
|
| - }],
|
| - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/build/linux/system.gyp:ssl',
|
| - ],
|
| - }],
|
| - ],
|
| - }, {
|
| - 'include_dirs': [
|
| - '<(ssl_root)',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| ['OS == "android"', {
|
| 'link_settings': {
|
| 'libraries': [
|
| @@ -733,6 +667,15 @@
|
| 'linux.h',
|
| ],
|
| }],
|
| + ['build_ssl==1', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
|
| + ],
|
| + }, {
|
| + 'include_dirs': [
|
| + '<(ssl_root)',
|
| + ],
|
| + }],
|
| ],
|
| },
|
| ],
|
|
|