Skip to content

Commit

Permalink
Revert "Revert "GN rtc_* templates: Set default visibility to webrtc_…
Browse files Browse the repository at this point in the history
…root + "/*"""

This reverts commit c73e1f4.

Reason for revert: 
The problem with failed deps in chrome content/renderer had already been fixed in https://webrtc-review.googlesource.com/c/src/+/38660

Original change's description:
> Revert "GN rtc_* templates: Set default visibility to webrtc_root + "/*""
> 
> This reverts commit 588c548.
> 
> Reason for revert: 
> 
> Breaks Chrome FYI:
> 
> /b/c/b/Linux_Builder/src/buildtools/linux64/gn gen //out/Release --check
>   -> returned 1
> ERROR at //build/split_static_library.gni:12:5: Dependency not allowed.
>     static_library(target_name) {
>     ^----------------------------
> The item //content/renderer:renderer
> can not depend on //third_party/webrtc/media:rtc_internal_video_codecs
> because it is not in //third_party/webrtc/media:rtc_internal_video_codecs's visibility list: [
>   //third_party/webrtc/*
>   //third_party/webrtc_overrides/*
> ]
> 
>  https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.webrtc.fyi%2FLinux_Builder%2F23560%2F%2B%2Frecipes%2Fsteps%2Fgenerate_build_files%2F0%2Fstdout
> 
> Original change's description:
> > GN rtc_* templates: Set default visibility to webrtc_root + "/*"
> > 
> > This means that by default, targets are visible to everything under
> > the WebRTC root, but not visible to anything else.
> > 
> > API targets are manually tagged with visibility "*", so that targets
> > outside the WebRTC tree can see them.
> > 
> > BUG=webrtc:8254
> > 
> > Change-Id: Icdbee6e0d22d93240ff2fb530c8f9dc48e351509
> > Reviewed-on: https://webrtc-review.googlesource.com/24140
> > Reviewed-by: Mirko Bonadei <[email protected]>
> > Commit-Queue: Karl Wiberg <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#21548}
> 
> [email protected],[email protected]
> 
> Change-Id: I06620ce3d6f67482935c22efa231dd6cab91625a
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:8254
> Reviewed-on: https://webrtc-review.googlesource.com/38760
> Reviewed-by: Per Kjellander <[email protected]>
> Commit-Queue: Per Kjellander <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#21555}

[email protected],[email protected],[email protected]

Change-Id: I6f720078ce21bd172e0a6471bae8c4c011e4a657
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8254
Reviewed-on: https://webrtc-review.googlesource.com/38860
Reviewed-by: Per Kjellander <[email protected]>
Commit-Queue: Per Kjellander <[email protected]>
Cr-Commit-Position: refs/heads/master@{#21558}
  • Loading branch information
perkj authored and Commit Bot committed Jan 10, 2018
1 parent 0e6d2f5 commit a7f2d84
Show file tree
Hide file tree
Showing 42 changed files with 167 additions and 22 deletions.
16 changes: 16 additions & 0 deletions api/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ if (is_android) {
}

group("api") {
visibility = [ "*" ]
public_deps = [
":libjingle_peerconnection_api",
]
}

rtc_source_set("call_api") {
visibility = [ "*" ]
sources = [
"call/audio_sink.h",
]
Expand All @@ -34,6 +36,7 @@ rtc_source_set("call_api") {
}

rtc_static_library("libjingle_peerconnection_api") {
visibility = [ "*" ]
cflags = []
sources = [
"candidate.cc",
Expand Down Expand Up @@ -114,6 +117,8 @@ rtc_static_library("libjingle_peerconnection_api") {
}

rtc_source_set("peerconnection_and_implicit_call_api") {
visibility = [ "*" ]

# The peerconnectioninterface.h file pulls in call/callfactoryinterface.h
# and the entire call module with it. We need to either get rid of this
# dependency or pull most of call/ into the API. For now, silence the warnings
Expand All @@ -126,12 +131,14 @@ rtc_source_set("peerconnection_and_implicit_call_api") {
}

rtc_source_set("libjingle_logging_api") {
visibility = [ "*" ]
sources = [
"rtceventlogoutput.h",
]
}

rtc_source_set("ortc_api") {
visibility = [ "*" ]
sources = [
"ortc/mediadescription.cc",
"ortc/mediadescription.h",
Expand Down Expand Up @@ -164,6 +171,7 @@ rtc_source_set("ortc_api") {
}

rtc_source_set("rtc_stats_api") {
visibility = [ "*" ]
cflags = []
sources = [
"stats/rtcstats.h",
Expand All @@ -179,6 +187,7 @@ rtc_source_set("rtc_stats_api") {
}

rtc_source_set("audio_mixer_api") {
visibility = [ "*" ]
sources = [
"audio/audio_mixer.h",
]
Expand All @@ -190,12 +199,14 @@ rtc_source_set("audio_mixer_api") {
}

rtc_source_set("transport_api") {
visibility = [ "*" ]
sources = [
"call/transport.h",
]
}

rtc_source_set("video_frame_api") {
visibility = [ "*" ]
sources = [
"video/video_content_type.cc",
"video/video_content_type.h",
Expand All @@ -215,6 +226,7 @@ rtc_source_set("video_frame_api") {
}

rtc_source_set("video_frame_api_i420") {
visibility = [ "*" ]
sources = [
"video/i420_buffer.cc",
"video/i420_buffer.h",
Expand All @@ -229,6 +241,7 @@ rtc_source_set("video_frame_api_i420") {
}

rtc_source_set("array_view") {
visibility = [ "*" ]
sources = [
"array_view.h",
]
Expand All @@ -239,6 +252,7 @@ rtc_source_set("array_view") {
}

rtc_source_set("optional") {
visibility = [ "*" ]
sources = [
"optional.cc",
"optional.h",
Expand All @@ -251,6 +265,7 @@ rtc_source_set("optional") {
}

rtc_source_set("refcountedbase") {
visibility = [ "*" ]
sources = [
"refcountedbase.h",
]
Expand All @@ -260,6 +275,7 @@ rtc_source_set("refcountedbase") {
}

rtc_source_set("libjingle_peerconnection_test_api") {
visibility = [ "*" ]
testonly = true
sources = [
"test/fakeconstraints.h",
Expand Down
3 changes: 3 additions & 0 deletions api/audio_codecs/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if (is_android) {
}

rtc_source_set("audio_codecs_api") {
visibility = [ "*" ]
sources = [
"audio_decoder.cc",
"audio_decoder.h",
Expand All @@ -38,6 +39,7 @@ rtc_source_set("audio_codecs_api") {
}

rtc_static_library("builtin_audio_decoder_factory") {
visibility = [ "*" ]
sources = [
"builtin_audio_decoder_factory.cc",
"builtin_audio_decoder_factory.h",
Expand Down Expand Up @@ -66,6 +68,7 @@ rtc_static_library("builtin_audio_decoder_factory") {
}

rtc_static_library("builtin_audio_encoder_factory") {
visibility = [ "*" ]
sources = [
"builtin_audio_encoder_factory.cc",
"builtin_audio_encoder_factory.h",
Expand Down
2 changes: 2 additions & 0 deletions api/audio_codecs/L16/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if (is_android) {
}

rtc_static_library("audio_encoder_L16") {
visibility = [ "*" ]
sources = [
"audio_encoder_L16.cc",
"audio_encoder_L16.h",
Expand All @@ -27,6 +28,7 @@ rtc_static_library("audio_encoder_L16") {
}

rtc_static_library("audio_decoder_L16") {
visibility = [ "*" ]
sources = [
"audio_decoder_L16.cc",
"audio_decoder_L16.h",
Expand Down
2 changes: 2 additions & 0 deletions api/audio_codecs/g711/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if (is_android) {
}

rtc_static_library("audio_encoder_g711") {
visibility = [ "*" ]
sources = [
"audio_encoder_g711.cc",
"audio_encoder_g711.h",
Expand All @@ -27,6 +28,7 @@ rtc_static_library("audio_encoder_g711") {
}

rtc_static_library("audio_decoder_g711") {
visibility = [ "*" ]
sources = [
"audio_decoder_g711.cc",
"audio_decoder_g711.h",
Expand Down
3 changes: 3 additions & 0 deletions api/audio_codecs/g722/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ if (is_android) {
}

rtc_source_set("audio_encoder_g722_config") {
visibility = [ "*" ]
sources = [
"audio_encoder_g722_config.h",
]
}

rtc_static_library("audio_encoder_g722") {
visibility = [ "*" ]
sources = [
"audio_encoder_g722.cc",
"audio_encoder_g722.h",
Expand All @@ -34,6 +36,7 @@ rtc_static_library("audio_encoder_g722") {
}

rtc_static_library("audio_decoder_g722") {
visibility = [ "*" ]
sources = [
"audio_decoder_g722.cc",
"audio_decoder_g722.h",
Expand Down
3 changes: 3 additions & 0 deletions api/audio_codecs/ilbc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ if (is_android) {
}

rtc_source_set("audio_encoder_ilbc_config") {
visibility = [ "*" ]
sources = [
"audio_encoder_ilbc_config.h",
]
}

rtc_static_library("audio_encoder_ilbc") {
visibility = [ "*" ]
sources = [
"audio_encoder_ilbc.cc",
"audio_encoder_ilbc.h",
Expand All @@ -34,6 +36,7 @@ rtc_static_library("audio_encoder_ilbc") {
}

rtc_static_library("audio_decoder_ilbc") {
visibility = [ "*" ]
sources = [
"audio_decoder_ilbc.cc",
"audio_decoder_ilbc.h",
Expand Down
6 changes: 6 additions & 0 deletions api/audio_codecs/isac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if (is_android) {
# on cleverly chosen criteria.

rtc_source_set("audio_encoder_isac") {
visibility = [ "*" ]
public = [
"audio_encoder_isac.h",
]
Expand All @@ -34,6 +35,7 @@ rtc_source_set("audio_encoder_isac") {
}

rtc_source_set("audio_decoder_isac") {
visibility = [ "*" ]
public = [
"audio_decoder_isac.h",
]
Expand Down Expand Up @@ -65,6 +67,7 @@ config("isac_config") {
}

rtc_static_library("audio_encoder_isac_fix") {
visibility = [ "*" ]
sources = [
"audio_encoder_isac_fix.cc",
"audio_encoder_isac_fix.h",
Expand All @@ -79,6 +82,7 @@ rtc_static_library("audio_encoder_isac_fix") {
}

rtc_static_library("audio_decoder_isac_fix") {
visibility = [ "*" ]
sources = [
"audio_decoder_isac_fix.cc",
"audio_decoder_isac_fix.h",
Expand All @@ -93,6 +97,7 @@ rtc_static_library("audio_decoder_isac_fix") {
}

rtc_static_library("audio_encoder_isac_float") {
visibility = [ "*" ]
sources = [
"audio_encoder_isac_float.cc",
"audio_encoder_isac_float.h",
Expand All @@ -107,6 +112,7 @@ rtc_static_library("audio_encoder_isac_float") {
}

rtc_static_library("audio_decoder_isac_float") {
visibility = [ "*" ]
sources = [
"audio_decoder_isac_float.cc",
"audio_decoder_isac_float.h",
Expand Down
3 changes: 3 additions & 0 deletions api/audio_codecs/opus/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if (is_android) {
}

rtc_static_library("audio_encoder_opus_config") {
visibility = [ "*" ]
sources = [
"audio_encoder_opus_config.cc",
"audio_encoder_opus_config.h",
Expand All @@ -30,6 +31,7 @@ rtc_static_library("audio_encoder_opus_config") {
}

rtc_source_set("audio_encoder_opus") {
visibility = [ "*" ]
public = [
"audio_encoder_opus.h",
]
Expand All @@ -50,6 +52,7 @@ rtc_source_set("audio_encoder_opus") {
}

rtc_static_library("audio_decoder_opus") {
visibility = [ "*" ]
sources = [
"audio_decoder_opus.cc",
"audio_decoder_opus.h",
Expand Down
1 change: 1 addition & 0 deletions api/video_codecs/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if (is_android) {
}

rtc_source_set("video_codecs_api") {
visibility = [ "*" ]
sources = [
"sdp_video_format.h",
"video_decoder.h",
Expand Down
1 change: 1 addition & 0 deletions audio/utility/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ group("utility") {
}

rtc_static_library("audio_frame_operations") {
visibility = [ "*" ]
sources = [
"audio_frame_operations.cc",
"audio_frame_operations.h",
Expand Down
1 change: 1 addition & 0 deletions call/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ rtc_source_set("rtp_interfaces") {
}

rtc_source_set("rtp_receiver") {
visibility = [ "*" ]
sources = [
"rtcp_demuxer.cc",
"rtcp_demuxer.h",
Expand Down
8 changes: 4 additions & 4 deletions common_audio/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ rtc_static_library("common_audio") {
}

rtc_source_set("mock_common_audio") {
visibility += [ "*" ]
visibility += webrtc_default_visibility
testonly = true
sources = [
"mocks/mock_smoothing_filter.h",
Expand Down Expand Up @@ -263,14 +263,14 @@ rtc_source_set("sinc_resampler") {
}

rtc_source_set("fir_filter") {
visibility += [ "*" ]
visibility += webrtc_default_visibility
sources = [
"fir_filter.h",
]
}

rtc_source_set("fir_filter_factory") {
visibility += [ "*" ]
visibility += webrtc_default_visibility
sources = [
"fir_filter_c.cc",
"fir_filter_c.h",
Expand Down Expand Up @@ -398,7 +398,7 @@ if (rtc_build_with_neon) {

if (rtc_include_tests) {
rtc_test("common_audio_unittests") {
visibility += [ "*" ]
visibility += webrtc_default_visibility
testonly = true

sources = [
Expand Down
2 changes: 2 additions & 0 deletions common_video/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ config("common_video_config") {
}

rtc_static_library("common_video") {
visibility = [ "*" ]

sources = [
"bitrate_adjuster.cc",
"h264/h264_bitstream_parser.cc",
Expand Down
1 change: 1 addition & 0 deletions logging/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ rtc_source_set("rtc_event_log_api") {
}

rtc_static_library("rtc_event_log_impl") {
visibility = [ "*" ]
sources = [
"rtc_event_log/encoder/rtc_event_log_encoder.h",
"rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc",
Expand Down
4 changes: 4 additions & 0 deletions media/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ config("rtc_media_warnings_config") {
}

rtc_source_set("rtc_h264_profile_id") {
visibility = [ "*" ]
sources = [
"base/h264_profile_level_id.cc",
"base/h264_profile_level_id.h",
Expand All @@ -52,6 +53,7 @@ rtc_source_set("rtc_h264_profile_id") {
}

rtc_static_library("rtc_media_base") {
visibility = [ "*" ]
defines = []
libs = []
deps = [
Expand Down Expand Up @@ -213,6 +215,7 @@ rtc_static_library("rtc_internal_video_codecs") {
}

rtc_static_library("rtc_audio_video") {
visibility = [ "*" ]
defines = []
libs = []
deps = [
Expand Down Expand Up @@ -373,6 +376,7 @@ rtc_static_library("rtc_data") {
}

rtc_source_set("rtc_media") {
visibility = [ "*" ]
public_deps = [
":rtc_audio_video",
":rtc_data",
Expand Down
Loading

0 comments on commit a7f2d84

Please sign in to comment.