зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1691306: move libsrtp from /netwerk to /third_party. r=bwc,necko-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D104335
This commit is contained in:
Nils Ohlmeier [:drno]
Родитель
767191f314
Коммит
5fd75514a3
|
|
@ -12,7 +12,7 @@ LOCAL_INCLUDES += [
|
||||||
"/dom/media/webrtc",
|
"/dom/media/webrtc",
|
||||||
"/ipc/chromium/src",
|
"/ipc/chromium/src",
|
||||||
"/media/webrtc",
|
"/media/webrtc",
|
||||||
"/netwerk/srtp/src/include",
|
"/third_party/libsrtp/src/include",
|
||||||
"/third_party/libwebrtc",
|
"/third_party/libwebrtc",
|
||||||
"/third_party/libwebrtc/webrtc",
|
"/third_party/libwebrtc/webrtc",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,8 @@ LOCAL_INCLUDES += [
|
||||||
"/dom/media/webrtc/transport/third_party/nrappkit/src/share",
|
"/dom/media/webrtc/transport/third_party/nrappkit/src/share",
|
||||||
"/dom/media/webrtc/transport/third_party/nrappkit/src/stats",
|
"/dom/media/webrtc/transport/third_party/nrappkit/src/stats",
|
||||||
"/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr",
|
"/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr",
|
||||||
"/netwerk/srtp/src/crypto/include",
|
"/third_party/libsrtp/src/crypto/include",
|
||||||
"/netwerk/srtp/src/include",
|
"/third_party/libsrtp/src/include",
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG["OS_TARGET"] in ["Darwin", "DragonFly", "FreeBSD", "NetBSD", "OpenBSD"]:
|
if CONFIG["OS_TARGET"] in ["Darwin", "DragonFly", "FreeBSD", "NetBSD", "OpenBSD"]:
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ DIRS += [
|
||||||
"/dom/media/webrtc/transport/third_party",
|
"/dom/media/webrtc/transport/third_party",
|
||||||
"/dom/media/webrtc/transport/build",
|
"/dom/media/webrtc/transport/build",
|
||||||
"/dom/media/webrtc/transport/ipc",
|
"/dom/media/webrtc/transport/ipc",
|
||||||
|
"/dom/media/webrtc/transport/srtp",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Add libFuzzer configuration directives
|
# Add libFuzzer configuration directives
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
This directory contains build files for libsrtp. The actual library
|
||||||
|
source is in $TOPSRCDIR/third_party/libsrtp/
|
||||||
|
|
||||||
|
The upstream git repository is https://github.com/cisco/libsrtp
|
||||||
|
|
||||||
|
TBD add code and instructions how to do a clean update import without manual
|
||||||
|
intervention.
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||||
|
# vim: set filetype=python:
|
||||||
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
if CONFIG["MOZ_SRTP"]:
|
||||||
|
DIRS += ["/third_party/libsrtp/src"]
|
||||||
|
|
@ -12,8 +12,8 @@ LOCAL_INCLUDES += [
|
||||||
"/ipc/chromium/src",
|
"/ipc/chromium/src",
|
||||||
"/media/libyuv/libyuv/include",
|
"/media/libyuv/libyuv/include",
|
||||||
"/media/webrtc",
|
"/media/webrtc",
|
||||||
"/netwerk/srtp/src/crypto/include",
|
"/third_party/libsrtp/src/crypto/include",
|
||||||
"/netwerk/srtp/src/include",
|
"/third_party/libsrtp/src/include",
|
||||||
"/third_party/libwebrtc",
|
"/third_party/libwebrtc",
|
||||||
"/third_party/libwebrtc/webrtc",
|
"/third_party/libwebrtc/webrtc",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ if (
|
||||||
"/dom/media/webrtc/transportbridge",
|
"/dom/media/webrtc/transportbridge",
|
||||||
"/ipc/chromium/src",
|
"/ipc/chromium/src",
|
||||||
"/media/webrtc/",
|
"/media/webrtc/",
|
||||||
"/netwerk/srtp/src/include",
|
"/third_party/libsrtp/src/include",
|
||||||
"/third_party/libwebrtc",
|
"/third_party/libwebrtc",
|
||||||
"/third_party/libwebrtc/webrtc",
|
"/third_party/libwebrtc/webrtc",
|
||||||
"/third_party/sipcc",
|
"/third_party/sipcc",
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,6 @@ DIRS += [
|
||||||
"url-classifier",
|
"url-classifier",
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG["MOZ_SRTP"]:
|
|
||||||
DIRS += ["srtp/src"]
|
|
||||||
|
|
||||||
if CONFIG["MOZ_SCTP"]:
|
if CONFIG["MOZ_SCTP"]:
|
||||||
DIRS += ["sctp/src", "sctp/datachannel"]
|
DIRS += ["sctp/src", "sctp/datachannel"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,3 +45,7 @@ with Files("pipewire/**"):
|
||||||
|
|
||||||
with Files('WinToast/**'):
|
with Files('WinToast/**'):
|
||||||
BUG_COMPONENT = ('Toolkit', 'General')
|
BUG_COMPONENT = ('Toolkit', 'General')
|
||||||
|
|
||||||
|
with Files('libsrtp/**'):
|
||||||
|
BUG_COMPONENT = ('Core', 'WeebRTC: Network')
|
||||||
|
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче