06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
105 lines
3.4 KiB
Diff
105 lines
3.4 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Tue, 1 Oct 2024 21:05:00 +0000
|
|
Subject: Bug 1921706 - use relative paths on deps in a few places to avoid
|
|
future issues. r=ng,webrtc-reviewers DONTBUILD
|
|
|
|
Note: this produces no changes in the generated moz.build files.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D224070
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/bbec1b95ddb5e00967a0fb002f54f8f24336b904
|
|
---
|
|
modules/audio_coding/BUILD.gn | 2 +-
|
|
modules/portal/BUILD.gn | 8 ++++----
|
|
modules/video_capture/BUILD.gn | 2 +-
|
|
sdk/BUILD.gn | 14 ++++++++++++++
|
|
test/BUILD.gn | 6 ++++++
|
|
5 files changed, 26 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
|
|
index 640aba6d40..1483048f25 100644
|
|
--- a/modules/audio_coding/BUILD.gn
|
|
+++ b/modules/audio_coding/BUILD.gn
|
|
@@ -358,7 +358,7 @@ rtc_library("webrtc_opus_wrapper") {
|
|
deps += [ rtc_opus_dir ]
|
|
public_configs = [ "//third_party/opus:opus_config" ]
|
|
} else if (build_with_mozilla) {
|
|
- public_configs = [ "//third_party/opus:opus_config" ]
|
|
+ public_configs = [ "../../third_party/opus:opus_config" ]
|
|
}
|
|
}
|
|
|
|
diff --git a/modules/portal/BUILD.gn b/modules/portal/BUILD.gn
|
|
index aff8609b54..901597ecde 100644
|
|
--- a/modules/portal/BUILD.gn
|
|
+++ b/modules/portal/BUILD.gn
|
|
@@ -137,10 +137,10 @@ if (!build_with_mozilla) {
|
|
deps -= [ ":pipewire_stubs" ]
|
|
defines -= [ "WEBRTC_DLOPEN_PIPEWIRE" ]
|
|
public_deps = [
|
|
- "//third_party/pipewire",
|
|
- "//third_party/drm",
|
|
- "//third_party/gbm",
|
|
- "//third_party/libepoxy"
|
|
+ "../../third_party/pipewire",
|
|
+ "../../third_party/drm",
|
|
+ "../../third_party/gbm",
|
|
+ "../../third_party/libepoxy"
|
|
]
|
|
}
|
|
}
|
|
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
|
|
index 27fc21df11..42a5011b49 100644
|
|
--- a/modules/video_capture/BUILD.gn
|
|
+++ b/modules/video_capture/BUILD.gn
|
|
@@ -110,7 +110,7 @@ if (!build_with_chromium || is_linux || is_chromeos) {
|
|
]
|
|
if (build_with_mozilla) {
|
|
configs -= [ "../portal:pipewire_base" ]
|
|
- public_deps = [ "//third_party/pipewire" ]
|
|
+ public_deps = [ "../../third_party/pipewire" ]
|
|
}
|
|
}
|
|
}
|
|
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
|
|
index 627e59cfed..185af67fa6 100644
|
|
--- a/sdk/BUILD.gn
|
|
+++ b/sdk/BUILD.gn
|
|
@@ -600,6 +600,20 @@ if (is_ios || is_mac) {
|
|
"CoreGraphics.framework",
|
|
"CoreVideo.framework",
|
|
]
|
|
+ if (build_with_mozilla) {
|
|
+ deps -= [
|
|
+ "//api/video:video_frame",
|
|
+ "//api/video:video_rtp_headers",
|
|
+ "//common_video",
|
|
+ "//rtc_base:checks",
|
|
+ ]
|
|
+ deps += [
|
|
+ "../api/video:video_frame",
|
|
+ "../api/video:video_rtp_headers",
|
|
+ "../common_video",
|
|
+ "../rtc_base:checks",
|
|
+ ]
|
|
+ }
|
|
}
|
|
|
|
if (!build_with_mozilla) {
|
|
diff --git a/test/BUILD.gn b/test/BUILD.gn
|
|
index 18179de94f..953e4c595e 100644
|
|
--- a/test/BUILD.gn
|
|
+++ b/test/BUILD.gn
|
|
@@ -484,6 +484,12 @@ rtc_source_set("test_support") {
|
|
"//testing/gmock",
|
|
"//testing/gtest",
|
|
]
|
|
+ if (build_with_mozilla) {
|
|
+ all_dependent_configs -= [
|
|
+ "//third_party/googletest:gmock_config",
|
|
+ "//third_party/googletest:gtest_config",
|
|
+ ]
|
|
+ }
|
|
}
|
|
|
|
rtc_library("fixed_fps_video_frame_writer_adapter") {
|