admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split SSL adapters from main ssl build target 1/2

Browse Source 
with an intermediate step since Chromium depends on the openssl_stream_adapter.h which will move to the new target.

BUG=webrtc:339300437

Change-Id: Iea163e0a6e3923ce8a741a2e11e9a2a1e3f3e7a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350887
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#42362}
This commit is contained in:
Philipp Hancke 2024-05-17 13:49:05 -07:00 committed by WebRTC LUCI CQ
parent dd44334bc9
commit c7fd5afd45
12 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/BUILD.gn
View File

@ -346,6 +346,7 @@ rtc_library("libjingle_peerconnection_api") {
"../rtc_base:network_constants",
"../rtc_base:rtc_certificate_generator",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"adaptation:resource_adaptation_api",
"audio:audio_mixer_api",

2
api/crypto/BUILD.gn
View File

@ -23,7 +23,7 @@ rtc_library("options") {
"crypto_options.h",
]
deps = [
"../../rtc_base:ssl",
"../../rtc_base:ssl_adapter",
"../../rtc_base/system:rtc_export",
]
}

5
examples/BUILD.gn
View File

@ -632,7 +632,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
deps = [
":AppRTCMobile_lib",
":apprtc_signaling",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../sdk:mediaconstraints_objc",
"../sdk:peerconnectionfactory_base_objc",
"../sdk:videocapture_objc",
@ -711,7 +711,7 @@ if (is_linux || is_chromeos || is_win) {
"../rtc_base:net_helpers",
"../rtc_base:refcount",
"../rtc_base:rtc_certificate_generator",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
"../rtc_base/third_party/sigslot",
@ -870,6 +870,7 @@ if (!build_with_chromium) {
"../rtc_base:network",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../rtc_base:timeutils",
"../test:scoped_key_value_config",

1
examples/androidnativeapi/BUILD.gn
View File

@ -51,6 +51,7 @@ if (is_android) {
"../../api:scoped_refptr",
"../../api:sequence_checker",
"../../rtc_base:ssl",
"../../rtc_base:ssl_adapter",
"../../rtc_base/synchronization:mutex",
"//api:libjingle_peerconnection_api",
"//api/rtc_event_log:rtc_event_log_factory",

2
examples/androidvoip/BUILD.gn
View File

@ -62,7 +62,7 @@ if (is_android) {
"../../rtc_base:network",
"../../rtc_base:socket_address",
"../../rtc_base:socket_server",
"../../rtc_base:ssl",
"../../rtc_base:ssl_adapter",
"../../rtc_base:threading",
"//api:transport_api",
"//api/audio_codecs:audio_codecs_api",

9
p2p/BUILD.gn
View File

@ -137,6 +137,7 @@ rtc_library("rtc_p2p") {
"../rtc_base:socket_factory",
"../rtc_base:socket_server",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stream",
"../rtc_base:stringutils",
"../rtc_base:threading",
@ -250,6 +251,7 @@ rtc_library("basic_packet_socket_factory") {
"../rtc_base:socket_address",
"../rtc_base:socket_factory",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base/system:rtc_export",
]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
@ -420,6 +422,7 @@ rtc_library("dtls_transport") {
"../rtc_base:logging",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stream",
"../rtc_base:stringutils",
"../rtc_base:threading",
@ -454,6 +457,7 @@ rtc_library("dtls_transport_internal") {
"../api/crypto:options",
"../rtc_base:callback_list",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
]
absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
@ -1095,6 +1099,7 @@ if (rtc_include_tests) {
"../rtc_base:socket_address",
"../rtc_base:socket_server",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../rtc_base:timeutils",
"../rtc_base/network:received_packet",
@ -1201,6 +1206,7 @@ if (rtc_include_tests) {
"../rtc_base:socket_address",
"../rtc_base:socket_address_pair",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:testclient",
"../rtc_base:threading",
@ -1251,6 +1257,7 @@ rtc_library("p2p_server_utils") {
"../rtc_base:socket_adapters",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base/network:received_packet",
"../rtc_base/third_party/sigslot",
@ -1305,7 +1312,7 @@ if (rtc_include_tests) {
"../rtc_base:gunit_helpers",
"../rtc_base:ip_address",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../test:test_support",
"//testing/gtest",
]

30
pc/BUILD.gn
View File

@ -136,7 +136,7 @@ rtc_source_set("dtls_srtp_transport") {
"../rtc_base:buffer",
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
@ -161,7 +161,7 @@ rtc_source_set("dtls_transport") {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../rtc_base/synchronization:mutex",
]
@ -238,6 +238,7 @@ rtc_source_set("jsep_transport") {
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
]
@ -323,6 +324,7 @@ rtc_source_set("jsep_transport_controller") {
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../rtc_base/third_party/sigslot",
]
@ -516,7 +518,7 @@ rtc_source_set("rtp_transport_internal") {
"../p2p:rtc_p2p",
"../rtc_base:callback_list",
"../rtc_base:network_route",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
]
}
@ -564,7 +566,7 @@ rtc_source_set("sctp_utils") {
"../rtc_base:byte_buffer",
"../rtc_base:copy_on_write_buffer",
"../rtc_base:logging",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
@ -585,7 +587,7 @@ rtc_source_set("srtp_session") {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:timeutils",
"../rtc_base/synchronization:mutex",
@ -623,7 +625,7 @@ rtc_source_set("srtp_transport") {
"../rtc_base:logging",
"../rtc_base:network_route",
"../rtc_base:safe_conversions",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:zero_memory",
"../rtc_base/third_party/base64",
]
@ -647,7 +649,7 @@ rtc_source_set("transport_stats") {
"../p2p:ice_transport_internal",
"../p2p:port",
"../p2p:rtc_p2p",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
]
}
@ -768,7 +770,7 @@ rtc_library("sctp_data_channel") {
"../rtc_base:copy_on_write_buffer",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../rtc_base:weak_ptr",
"../rtc_base/containers:flat_set",
@ -848,7 +850,7 @@ rtc_source_set("data_channel_controller") {
"../rtc_base:copy_on_write_buffer",
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../rtc_base:weak_ptr",
]
@ -936,6 +938,7 @@ rtc_source_set("rtc_stats_collector") {
"../rtc_base:rtc_event",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
"../rtc_base:timeutils",
@ -1034,6 +1037,7 @@ rtc_source_set("sdp_offer_answer") {
"../rtc_base:macromagic",
"../rtc_base:rtc_operations_chain",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
"../rtc_base:unique_id_generator",
@ -1155,6 +1159,7 @@ rtc_source_set("peer_connection") {
"../rtc_base:network_constants",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
"../rtc_base:unique_id_generator",
@ -1247,6 +1252,7 @@ rtc_source_set("legacy_stats_collector") {
"../rtc_base:network_constants",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
"../rtc_base:timeutils",
@ -1358,6 +1364,7 @@ rtc_source_set("webrtc_session_description_factory") {
"../rtc_base:logging",
"../rtc_base:rtc_certificate_generator",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:unique_id_generator",
"../rtc_base:weak_ptr",
@ -2098,6 +2105,7 @@ if (rtc_include_tests && !build_with_chromium) {
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:task_queue_for_test",
"../rtc_base:threading",
@ -2442,6 +2450,7 @@ if (rtc_include_tests && !build_with_chromium) {
"../rtc_base:rtc_json",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:task_queue_for_test",
"../rtc_base:threading",
@ -2539,7 +2548,7 @@ if (rtc_include_tests && !build_with_chromium) {
"test/android_test_initializer.h",
]
deps = [
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../sdk/android:internal_jni",
"../sdk/android:libjingle_peerconnection_jni",
"//modules/utility:utility",
@ -2653,6 +2662,7 @@ if (rtc_include_tests && !build_with_chromium) {
"../rtc_base:safe_conversions",
"../rtc_base:socket_address",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:task_queue_for_test",
"../rtc_base:threading",
"../rtc_base:timeutils",

6
rtc_base/BUILD.gn
View File

@ -1618,6 +1618,11 @@ rtc_library("ssl") {
}
}
rtc_library("ssl_adapter") {
visibility = [ "*" ]
public_deps += [ ":ssl" ] # no-presubmit-check TODO(webrtc:8603)
}
rtc_source_set("gtest_prod") {
sources = [ "gtest_prod_util.h" ]
}
@ -2117,6 +2122,7 @@ if (rtc_include_tests) {
":socket_factory",
":socket_server",
":ssl",
":ssl_adapter",
":ssl_header",
":stream",
":stringutils",

2
rtc_tools/data_channel_benchmark/BUILD.gn
View File

@ -61,7 +61,7 @@ rtc_executable("data_channel_benchmark") {
"../../rtc_base:logging",
"../../rtc_base:refcount",
"../../rtc_base:rtc_event",
"../../rtc_base:ssl",
"../../rtc_base:ssl_adapter",
"../../rtc_base:threading",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/cleanup:cleanup",

2
sdk/BUILD.gn
View File

@ -1093,6 +1093,7 @@ if (is_ios || is_mac) {
"../rtc_base:rtc_certificate_generator",
"../rtc_base:safe_conversions",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:stringutils",
"../rtc_base:threading",
"../rtc_base:timeutils",
@ -1602,6 +1603,7 @@ if (is_ios || is_mac) {
"../rtc_base:buffer",
"../rtc_base:logging",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
]
if (is_ios) {

4
sdk/android/BUILD.gn
View File

@ -140,7 +140,7 @@ if (is_android) {
":native_api_jni",
":video_egl_jni",
"../../pc:libjingle_peerconnection",
"../../rtc_base:ssl",
"../../rtc_base:ssl_adapter",
"//third_party/jni_zero",
]
output_extension = "so"
@ -1581,7 +1581,7 @@ if (is_android) {
":libjingle_peerconnection_metrics_default_jni",
":native_api_jni",
"../../pc:libjingle_peerconnection",
"../../rtc_base:ssl",
"../../rtc_base:ssl_adapter",
]
output_extension = "so"
}

2
test/BUILD.gn
View File

@ -612,7 +612,7 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../rtc_base:event_tracer",
"../rtc_base:logging",
"../rtc_base:ssl",
"../rtc_base:ssl_adapter",
"../rtc_base:threading",
"../system_wrappers:field_trial",
"../system_wrappers:metrics",