Changeset 6120 for pjproject/trunk/pjsip-apps/src/swig/java/Makefile

Timestamp:

Dec 19, 2019 2:57:20 AM (4 years ago)

Author:

nanang

Message:

Fix #2256: Mini refactored Android configure script:

• added CXXFLAGS & LDFLAGS parsing (from ndk-build output), CXXFLAGS was set to CFLAGS.
• updated WebRTC instruction set to use SSE2, was generic, for Android emulator (x86 ABI).
• updated C++ library/STL backend to use c++_shared, somehow '-lc++_static' is ignored after the refactor, also the official NDK docs mentions that c++_static may cause undefined behavior for app with multiple shared libraries (note pjsua2 app may use other shared libraries).

File:

• pjproject/trunk/pjsip-apps/src/swig/java/Makefile (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/swig/java/Makefile

@@ -164 +164 @@
 ifeq ($(OS),android)
         mkdir -p android/app/src/main/jniLibs/$(TARGET_ARCH)
+        # copy libc++_shared.so manually
+        cp -f ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TARGET_ARCH}/libc++_shared.so android/app/src/main/jniLibs/$(TARGET_ARCH)
 endif
         $(PJ_CXX) -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o \
-                $(MY_CFLAGS) $(MY_LDFLAGS)
+                $(MY_LDFLAGS)
 
 $(OUT_DIR)/pjsua2_wrap.o: $(OUT_DIR)/pjsua2_wrap.cpp Makefile