pjproject: Clean up disabling of WebRTC support.
authorJoshua Colp <jcolp@digium.com>
Mon, 4 Dec 2017 00:49:14 +0000 (00:49 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 4 Dec 2017 00:54:04 +0000 (18:54 -0600)
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
third-party/pjproject/patches/config_site.h

index 56b2c49..715a4b8 100644 (file)
@@ -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
index a11bc06..d5aee82 100644 (file)
  */
 #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
 #if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)
 #define NDEBUG 1