Bundled pjproject: Enable pj_assert when dev-mode is enabled.

ASTERISK-27359

Change-Id: Ib01fb6c01f9bb87129374a51cb9318c474147517

diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index 7a42edcde2cea43d41ad9bd60db74c79a49c7033..9d5a9cb1c803196a8d23d3727b4015860543bbff 100644 (file)
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -61,6 +61,9 @@ ifeq ($(SPECIAL_TARGETS),)
                 TARGETS += source/pjsip-apps/src/python/_pjsua.so
             endif
         endif
+        ifeq ($(AST_DEVMODE),yes)
+            CF += -DPJPROJECT_BUNDLED_ASSERTIONS=yes
+        endif
         ifeq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),MALLOC_DEBUG)
             CF += -DMALLOC_DEBUG
             MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a

diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h
index 561b3a231f1ddfcc8892945e42379e95989518c7..a11bc06407f4bbc50c59b0382aab2d6bbe786a35 100644 (file)
--- a/third-party/pjproject/patches/config_site.h
+++ b/third-party/pjproject/patches/config_site.h
@@ -27,7 +27,10 @@
 #define PJMEDIA_HAS_WEBRTC_AEC 0
 
 #define PJ_HAS_IPV6 1
+#if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)
 #define NDEBUG 1
+#endif
+
 #define PJ_MAX_HOSTNAME (256)
 #define PJSIP_MAX_URL_SIZE (512)
 #ifdef PJ_HAS_LINUX_EPOLL