mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
a7f2d84ad1
This reverts commitc73e1f4378. 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 commit588c548657. > > 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 <mbonadei@webrtc.org> > > Commit-Queue: Karl Wiberg <kwiberg@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21548} > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org > > 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 <perkj@webrtc.org> > Commit-Queue: Per Kjellander <perkj@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#21555} TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,perkj@webrtc.org 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 <perkj@webrtc.org> Commit-Queue: Per Kjellander <perkj@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21558}
97 lines
2.6 KiB
Text
97 lines
2.6 KiB
Text
# Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("../../webrtc.gni")
|
|
if (is_android) {
|
|
import("//build/config/android/config.gni")
|
|
import("//build/config/android/rules.gni")
|
|
}
|
|
|
|
rtc_source_set("audio_codecs_api") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"audio_decoder.cc",
|
|
"audio_decoder.h",
|
|
"audio_decoder_factory.h",
|
|
"audio_decoder_factory_template.h",
|
|
"audio_encoder.cc",
|
|
"audio_encoder.h",
|
|
"audio_encoder_factory.h",
|
|
"audio_encoder_factory_template.h",
|
|
"audio_format.cc",
|
|
"audio_format.h",
|
|
]
|
|
deps = [
|
|
"..:array_view",
|
|
"..:optional",
|
|
"../..:webrtc_common",
|
|
"../../:typedefs",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:deprecation",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base:sanitizer",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("builtin_audio_decoder_factory") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"builtin_audio_decoder_factory.cc",
|
|
"builtin_audio_decoder_factory.h",
|
|
]
|
|
deps = [
|
|
":audio_codecs_api",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"L16:audio_decoder_L16",
|
|
"g711:audio_decoder_g711",
|
|
"g722:audio_decoder_g722",
|
|
"isac:audio_decoder_isac",
|
|
]
|
|
defines = []
|
|
if (rtc_include_ilbc) {
|
|
deps += [ "ilbc:audio_decoder_ilbc" ]
|
|
defines += [ "WEBRTC_USE_BUILTIN_ILBC=1" ]
|
|
} else {
|
|
defines += [ "WEBRTC_USE_BUILTIN_ILBC=0" ]
|
|
}
|
|
if (rtc_include_opus) {
|
|
deps += [ "opus:audio_decoder_opus" ]
|
|
defines += [ "WEBRTC_USE_BUILTIN_OPUS=1" ]
|
|
} else {
|
|
defines += [ "WEBRTC_USE_BUILTIN_OPUS=0" ]
|
|
}
|
|
}
|
|
|
|
rtc_static_library("builtin_audio_encoder_factory") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"builtin_audio_encoder_factory.cc",
|
|
"builtin_audio_encoder_factory.h",
|
|
]
|
|
deps = [
|
|
":audio_codecs_api",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"L16:audio_encoder_L16",
|
|
"g711:audio_encoder_g711",
|
|
"g722:audio_encoder_g722",
|
|
"isac:audio_encoder_isac",
|
|
]
|
|
defines = []
|
|
if (rtc_include_ilbc) {
|
|
deps += [ "ilbc:audio_encoder_ilbc" ]
|
|
defines += [ "WEBRTC_USE_BUILTIN_ILBC=1" ]
|
|
} else {
|
|
defines += [ "WEBRTC_USE_BUILTIN_ILBC=0" ]
|
|
}
|
|
if (rtc_include_opus) {
|
|
deps += [ "opus:audio_encoder_opus" ]
|
|
defines += [ "WEBRTC_USE_BUILTIN_OPUS=1" ]
|
|
} else {
|
|
defines += [ "WEBRTC_USE_BUILTIN_OPUS=0" ]
|
|
}
|
|
}
|