<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7425">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Joshua Colp: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject: Clean up disabling of WebRTC support.<br><br>The definition in config_site.h and the argument to the<br>configure script are not necessary to disable WebRTC<br>support. The correct argument, --disable-libwebrtc, is<br>already passed.<br><br>ASTERISK-26980<br><br>Change-Id: I27da2c894f87914956a72710222e17462d8a44bc<br>---<br>M third-party/pjproject/Makefile.rules<br>M third-party/pjproject/patches/config_site.h<br>2 files changed, 1 insertion(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules<br>index 56b2c49..715a4b8 100644<br>--- a/third-party/pjproject/Makefile.rules<br>+++ b/third-party/pjproject/Makefile.rules<br>@@ -37,8 +37,7 @@<br>   --disable-ipp \<br>       --disable-libwebrtc \<br>         --without-external-pa \<br>-      --without-external-srtp \<br>-    --without-external-webrtc<br>+    --without-external-srtp<br> <br> ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),)<br>     PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec<br>diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h<br>index 561b3a2..8f98969 100644<br>--- a/third-party/pjproject/patches/config_site.h<br>+++ b/third-party/pjproject/patches/config_site.h<br>@@ -20,12 +20,6 @@<br>  */<br> #define PJMEDIA_HAS_SRTP 0<br> <br>-/*<br>- * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use<br>- * webrtc.  It only disables the pjmedia webrtc transport which Asterisk doesn't use.<br>- */<br>-#define PJMEDIA_HAS_WEBRTC_AEC 0<br>-<br> #define PJ_HAS_IPV6 1<br> #define NDEBUG 1<br> #define PJ_MAX_HOSTNAME (256)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7425">change 7425</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7425"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I27da2c894f87914956a72710222e17462d8a44bc </div>
<div style="display:none"> Gerrit-Change-Number: 7425 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>