zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using public_deps in system_wrappers.

Browse Source 
TBR=phoglund@webrtc.org

Bug: webrtc:8603
Change-Id: I5e515f0e4dc955a01460d69ba4e21bdfdf152d20
Reviewed-on: https://webrtc-review.googlesource.com/29104
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21112}
This commit is contained in:
Mirko Bonadei
2017-12-06 09:17:14 +01:00
committed by Commit Bot
parent c74d8da339
commit a498ae83ac
20 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
call/BUILD.gn
View File

@ -101,6 +101,7 @@ rtc_source_set("bitrate_allocator") {
"../rtc_base:rtc_base_approved",
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
"../system_wrappers:metrics_api",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -145,6 +146,7 @@ rtc_static_library("call") {
"../rtc_base:rtc_task_queue",
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
"../system_wrappers:metrics_api",
"../video",
]
}

12
common_audio/BUILD.gn
View File

@ -63,6 +63,7 @@ rtc_static_library("common_audio") {
"../rtc_base:gtest_prod",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
]
public_deps = [
":common_audio_c",
@ -221,7 +222,8 @@ rtc_source_set("common_audio_c") {
"..:webrtc_common",
"../rtc_base:compile_assert_c",
"../rtc_base:rtc_base_approved",
"../system_wrappers:system_wrappers",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
]
}
@ -236,7 +238,7 @@ rtc_source_set("common_audio_cc") {
deps = [
"..:webrtc_common",
"../rtc_base:rtc_base_approved",
"../system_wrappers:system_wrappers",
"../system_wrappers",
]
}
@ -298,7 +300,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
":fir_filter",
":sinc_resampler",
"../rtc_base:rtc_base_approved",
"../system_wrappers:system_wrappers",
"../system_wrappers",
]
}
}
@ -337,7 +339,7 @@ if (rtc_build_with_neon) {
":fir_filter",
":sinc_resampler",
"../rtc_base:rtc_base_approved",
"../system_wrappers:system_wrappers",
"../system_wrappers",
]
public_deps = [
@ -437,7 +439,7 @@ if (rtc_include_tests) {
"..:webrtc_common",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
"../test:test_main",
"//testing/gmock",
"//testing/gtest",

2
media/BUILD.gn
View File

@ -130,6 +130,8 @@ rtc_static_library("rtc_audio_video") {
"../api:video_frame_api_i420",
"../call:call_interfaces",
"../modules/video_coding:video_coding_utility",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
]
sources = [
"engine/adm_helpers.cc",

21
modules/audio_coding/BUILD.gn
View File

@ -124,6 +124,7 @@ rtc_static_library("audio_coding") {
}
deps = audio_coding_deps + [
"../../system_wrappers:metrics_api",
"..:module_api",
"../../api:array_view",
"../../api/audio_codecs:audio_codecs_api",
@ -660,7 +661,7 @@ rtc_source_set("isac_fix_c") {
"../../common_audio",
"../../rtc_base:compile_assert_c",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
]
public_deps = [
@ -796,7 +797,7 @@ rtc_static_library("webrtc_opus") {
"../../common_audio",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
]
public_deps = [
":webrtc_opus_c",
@ -905,6 +906,7 @@ rtc_static_library("audio_network_adaptor") {
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
]
if (rtc_enable_protobuf) {
@ -1016,7 +1018,8 @@ rtc_static_library("neteq") {
"../../common_audio",
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
]
}
@ -1265,7 +1268,7 @@ if (rtc_include_tests) {
"../../api:optional",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:test_support",
]
defines = audio_coding_defines
@ -1295,7 +1298,8 @@ if (rtc_include_tests) {
"../../api/audio_codecs/opus:audio_encoder_opus",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../test:test_support",
]
@ -1619,10 +1623,10 @@ if (rtc_include_tests) {
"../../api/audio_codecs/L16:audio_encoder_L16",
"../../api/audio_codecs/g722:audio_encoder_g722",
"../../api/audio_codecs/ilbc:audio_encoder_ilbc",
"../../system_wrappers:system_wrappers_default",
"../../api/audio_codecs/isac:audio_encoder_isac",
"../../api/audio_codecs/opus:audio_encoder_opus",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
]
sources = [
@ -1636,10 +1640,10 @@ if (rtc_include_tests) {
testonly = true
deps = audio_coding_deps + [
"../../system_wrappers:system_wrappers_default",
"../rtp_rtcp:rtp_rtcp_format",
"../../api:array_view",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
]
sources = [
@ -2054,7 +2058,8 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
"../../test:audio_codec_mocks",
"../../test:field_trial",
"../../test:rtp_test_utils",

1
modules/audio_device/BUILD.gn
View File

@ -104,6 +104,7 @@ rtc_source_set("audio_device_generic") {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers",
"../../system_wrappers:metrics_api",
"../utility",
]

16
modules/audio_processing/BUILD.gn
View File

@ -248,6 +248,8 @@ rtc_static_library("audio_processing") {
"../../audio/utility:audio_frame_operations",
"../../rtc_base:gtest_prod",
"../../rtc_base:protobuf_utils",
"../../system_wrappers:cpu_features_api",
"../../system_wrappers:metrics_api",
"../audio_coding:isac",
]
@ -376,7 +378,7 @@ rtc_source_set("audio_processing_c") {
"../..:webrtc_common",
"../../common_audio",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
]
if (rtc_build_with_neon) {
@ -570,7 +572,8 @@ if (rtc_include_tests) {
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
"../../test:test_support",
"../audio_coding:neteq_input_audio_tools",
"aec_dump:mock_aec_dump_unittests",
@ -707,7 +710,7 @@ if (rtc_include_tests) {
"../../modules:module_api",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:test_support",
]
@ -806,7 +809,7 @@ if (rtc_include_tests) {
"../../api:optional",
"../../common_audio",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:test_support",
"../audio_coding:neteq_input_audio_tools",
"//testing/gtest",
@ -826,8 +829,7 @@ if (rtc_include_tests) {
"../..:webrtc_common",
"../../common_audio:common_audio",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics_default",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:test_support",
"//testing/gtest",
]
@ -843,8 +845,8 @@ if (rtc_include_tests) {
deps = [
":audio_processing",
"../..:webrtc_common",
"../../system_wrappers",
"../../system_wrappers:metrics_default",
"../../system_wrappers:system_wrappers",
]
}

4
modules/congestion_controller/BUILD.gn
View File

@ -55,6 +55,8 @@ rtc_static_library("congestion_controller") {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
"../bitrate_controller",
"../pacing",
"../remote_bitrate_estimator",
@ -88,7 +90,7 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:field_trial",
"../../test:test_support",
"../bitrate_controller:bitrate_controller",

4
modules/desktop_capture/BUILD.gn
View File

@ -87,7 +87,7 @@ if (rtc_include_tests) {
":primitives",
"../..:webrtc_common",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
"../../test:test_support",
"//testing/gmock",
]
@ -329,6 +329,8 @@ rtc_static_library("desktop_capture_generic") {
"../../api:refcountedbase",
"../../rtc_base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
"../../system_wrappers:metrics_api",
"//third_party/libyuv",
]

4
modules/pacing/BUILD.gn
View File

@ -39,6 +39,7 @@ rtc_static_library("pacing") {
"../../logging:rtc_event_log_api",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../remote_bitrate_estimator",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
@ -61,7 +62,8 @@ if (rtc_include_tests) {
":pacing",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../test:field_trial",
"../../test:test_support",
"../rtp_rtcp",

5
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -51,6 +51,8 @@ rtc_static_library("remote_bitrate_estimator") {
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
]
}
@ -143,6 +145,7 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../test:test_support",
"../../voice_engine",
"../bitrate_controller",
@ -202,7 +205,7 @@ if (rtc_include_tests) {
"../..:webrtc_common",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:field_trial",
"../../test:test_support",
"../pacing:pacing",

6
modules/rtp_rtcp/BUILD.gn
View File

@ -203,6 +203,8 @@ rtc_static_library("rtp_rtcp") {
"../../rtc_base:rtc_numerics",
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
"../audio_coding:audio_format_conversion",
"../remote_bitrate_estimator",
]
@ -238,7 +240,7 @@ rtc_source_set("rtcp_transceiver") {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:weak_ptr",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
]
}
@ -399,7 +401,7 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:field_trial",
"../../test:rtp_test_utils",
"../../test:test_common",

12
modules/video_coding/BUILD.gn
View File

@ -109,6 +109,8 @@ rtc_static_library("video_coding") {
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
"../pacing",
"../rtp_rtcp:rtp_rtcp_format",
"../utility:utility",
@ -197,7 +199,7 @@ rtc_static_library("webrtc_h264") {
"../../api/video_codecs:video_codecs_api",
"../../media:rtc_media_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:metrics_api",
]
if (rtc_use_h264) {
@ -303,6 +305,8 @@ rtc_static_library("webrtc_vp8") {
"../../rtc_base:rtc_numerics",
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
]
if (rtc_build_libvpx) {
deps += [ rtc_libvpx_dir ]
@ -426,7 +430,7 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
@ -594,8 +598,10 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
"../../system_wrappers:metrics_default",
"../../system_wrappers:system_wrappers",
"../../test:field_trial",
"../../test:test_support",
"../../test:video_test_common",

2
modules/video_processing/BUILD.gn
View File

@ -32,7 +32,7 @@ rtc_static_library("video_processing") {
"../../common_video",
"../../modules/utility",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
]
if (build_video_processing_sse2) {
deps += [ ":video_processing_sse2" ]

3
pc/BUILD.gn
View File

@ -187,7 +187,8 @@ rtc_static_library("peerconnection") {
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../stats",
"../system_wrappers:system_wrappers",
"../system_wrappers",
"../system_wrappers:field_trial_api",
]
public_deps = [

6
sdk/BUILD.gn
View File

@ -544,12 +544,11 @@ if (is_ios || is_mac) {
":peerconnectionfactory_objc",
":videotoolbox_objc",
":videotracksource_objc",
"..//system_wrappers:system_wrappers_default",
"../../system_wrappers:system_wrappers_default",
"../media:rtc_media_base",
"../modules:module_api",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:system_wrappers_default",
]
public_deps = [
"//build/config/ios:xctest",
@ -622,11 +621,10 @@ if (is_ios || is_mac) {
":peerconnectionfactory_objc",
":videotoolbox_objc",
":videotracksource_objc",
"..//system_wrappers:system_wrappers_default",
"../../system_wrappers:system_wrappers_default",
"../media:rtc_media_base",
"../modules:module_api",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:system_wrappers_default",
"//test:test_support",
"//third_party/ocmock",
]

7
sdk/android/BUILD.gn
View File

@ -224,7 +224,8 @@ rtc_static_library("video_jni") {
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../rtc_base:weak_ptr",
"../../system_wrappers:system_wrappers",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
]
}
@ -370,7 +371,7 @@ rtc_static_library("peerconnection_jni") {
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers:system_wrappers",
"../../system_wrappers:field_trial_api",
]
}
@ -405,8 +406,8 @@ rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
":generated_metrics_jni",
":peerconnection_jni",
"../../pc:peerconnection",
"../../system_wrappers",
"../../system_wrappers:field_trial_default",
"../../system_wrappers:metrics_api",
"../../system_wrappers:metrics_default",
]
}

9
system_wrappers/BUILD.gn
View File

@ -50,14 +50,12 @@ rtc_static_library("system_wrappers") {
defines = []
libs = []
deps = [
"..:webrtc_common",
"../api:optional",
"../modules:module_api_public",
]
public_deps = [
":cpu_features_api",
":field_trial_api",
":metrics_api",
"..:webrtc_common",
"../api:optional",
"../modules:module_api_public",
]
if (is_android) {
@ -211,6 +209,7 @@ if (rtc_include_tests) {
}
deps = [
":metrics_api",
":metrics_default",
":system_wrappers",
"..:webrtc_common",

5
test/BUILD.gn
View File

@ -108,7 +108,7 @@ rtc_source_set("field_trial") {
deps = [
"..:webrtc_common",
"../system_wrappers",
"../system_wrappers:field_trial_api",
"../system_wrappers:field_trial_default",
]
}
@ -504,7 +504,7 @@ rtc_source_set("fake_audio_device") {
"../common_audio:common_audio",
"../modules/audio_device:audio_device",
"../rtc_base:rtc_base_approved",
"../system_wrappers:system_wrappers",
"../system_wrappers",
]
}
@ -585,6 +585,7 @@ rtc_source_set("test_common") {
"../rtc_base:rtc_task_queue",
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
"../system_wrappers:field_trial_api",
"../video",
"../voice_engine",
"//testing/gmock",

3
video/BUILD.gn
View File

@ -64,6 +64,8 @@ rtc_static_library("video") {
"../call:rtp_interfaces",
"../call:video_stream_api",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
# For RtxReceiveStream.
"../call:rtp_receiver",
@ -115,6 +117,7 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_task_queue",
"../system_wrappers",
"../system_wrappers:field_trial_api",
"../test:rtp_test_utils",
"../test:test_common",
"../test:test_renderer",

2
voice_engine/BUILD.gn
View File

@ -76,6 +76,8 @@ rtc_static_library("voice_engine") {
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
"../system_wrappers",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
]
}