[Asterisk-code-review] pjproject: Clean up disabling of WebRTC support. (asterisk[master])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7427 )

Change subject: pjproject: Clean up disabling of WebRTC support.
......................................................................

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
---
M third-party/pjproject/Makefile.rules
M third-party/pjproject/patches/config_site.h
2 files changed, 1 insertion(+), 8 deletions(-)

Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules
index 56b2c49..715a4b8 100644
--- a/third-party/pjproject/Makefile.rules
+++ b/third-party/pjproject/Makefile.rules
@@ -37,8 +37,7 @@
 	--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 a11bc06..d5aee82 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
 #if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)
 #define NDEBUG 1

-- 
To view, visit https://gerrit.asterisk.org/7427
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I27da2c894f87914956a72710222e17462d8a44bc
Gerrit-Change-Number: 7427
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171205/536b9649/attachment.html>