From 31e9e31ea54a527ff86a96e3ff1f6620fb98fd49 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 4 Dec 2017 00:49:14 +0000 Subject: pjproject: Clean up disabling of WebRTC support. The definition in config_site.h and the argument to the configure script are not necessary to disable WebRTC support. The correct argument, --disable-libwebrtc, is already passed. ASTERISK-26980 Change-Id: I27da2c894f87914956a72710222e17462d8a44bc --- third-party/pjproject/Makefile.rules | 3 +-- third-party/pjproject/patches/config_site.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules index 56b2c4934..715a4b8cd 100644 --- a/third-party/pjproject/Makefile.rules +++ b/third-party/pjproject/Makefile.rules @@ -37,8 +37,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) --prefix=/opt/pjproject \ --disable-ipp \ --disable-libwebrtc \ --without-external-pa \ - --without-external-srtp \ - --without-external-webrtc + --without-external-srtp ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),) PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h index 561b3a231..8f989699f 100644 --- a/third-party/pjproject/patches/config_site.h +++ b/third-party/pjproject/patches/config_site.h @@ -20,12 +20,6 @@ */ #define PJMEDIA_HAS_SRTP 0 -/* - * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use - * webrtc. It only disables the pjmedia webrtc transport which Asterisk doesn't use. - */ -#define PJMEDIA_HAS_WEBRTC_AEC 0 - #define PJ_HAS_IPV6 1 #define NDEBUG 1 #define PJ_MAX_HOSTNAME (256) -- cgit v1.2.3