sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Android build issues on NDK r23 and r24 (#2974)

This commit is contained in:
sauwming 2022-02-16 11:38:44 +08:00 committed by GitHub
parent b1d29fd4e7
commit 3c2219e4d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aconfigure
View File

@ -7241,7 +7241,7 @@ else
SAVED_LIBS="$LIBS"
LIBS="-lGLESv2 -lEGL -landroid -lgcc -lc"
LIBS="-lGLESv2 -lEGL -landroid -lc"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

2
aconfigure.ac
View File

@ -911,7 +911,7 @@ else
AC_SUBST(ac_pjmedia_video_has_android)
AC_SUBST(ac_android_cflags)
SAVED_LIBS="$LIBS"
LIBS="-lGLESv2 -lEGL -landroid -lgcc -lc"
LIBS="-lGLESv2 -lEGL -landroid -lc"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[ac_pjmedia_video_has_android=yes],[ac_pjmedia_video_has_android=no])
LIBS="$SAVED_LIBS"
if test "$ac_pjmedia_video_has_android" = "yes"; then

3
pjsip-apps/src/swig/java/Makefile
View File

@ -148,13 +148,14 @@ else
ifeq ($(OS),android)
MY_JNI_CFLAGS+= -D__ANDROID__
MY_JNI_LDFLAGS+= -Wl,-soname,libpjsua2.so
MY_JNI_LDXXLIBS+= -landroid
SWIG_FLAGS+= -D__ANDROID__
endif
endif
# Build settings
MY_CFLAGS := $(PJ_CXXFLAGS) $(MY_JNI_CFLAGS) $(CFLAGS)
MY_LDFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS)
MY_LDFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS)
MY_PACKAGE_NAME := org.pjsip.pjsua2
ifeq ($(OS),android)
MY_PACKAGE_PATH := android/pjsua2/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))