Fix ortc_api circular deps.
This will help keep ortc dependencies clean in the future, since
gn --check forces us to depend on components from which we include
headers.
cryptoparams.h moves into api/, but ortc appears to think it
should be there anyway. We could consider moving it into the ortc/ api,
but it doesn't appear to be specific to ortc.
Bug: webrtc:6828
Change-Id: Iddae438d10b5e84b2fbc52565364319e20f90613
Reviewed-on: https://webrtc-review.googlesource.com/22660
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20686}
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 606e9d9..0289fe8 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -38,6 +38,7 @@
sources = [
"candidate.cc",
"candidate.h",
+ "cryptoparams.h",
"datachannelinterface.h",
"dtmfsenderinterface.h",
"jsep.h",
@@ -147,7 +148,6 @@
}
rtc_source_set("ortc_api") {
- check_includes = false # TODO(deadbeef): Remove (bugs.webrtc.org/6828)
sources = [
"ortc/mediadescription.cc",
"ortc/mediadescription.h",
@@ -167,8 +167,11 @@
# TODO(deadbeef): Create a separate target for the common things ORTC and
# PeerConnection code shares, so that ortc_api can depend on that instead of
# libjingle_peerconnection_api.
- public_deps = [
+ deps = [
":libjingle_peerconnection_api",
+ ":optional",
+ "..:webrtc_common",
+ "../rtc_base:rtc_base",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).