Ignore:
Timestamp:
Dec 19, 2019 2:57:20 AM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/swig/java/Makefile

    r5895 r6120  
    164164ifeq ($(OS),android) 
    165165        mkdir -p android/app/src/main/jniLibs/$(TARGET_ARCH) 
     166        # copy libc++_shared.so manually 
     167        cp -f ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TARGET_ARCH}/libc++_shared.so android/app/src/main/jniLibs/$(TARGET_ARCH) 
    166168endif 
    167169        $(PJ_CXX) -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o \ 
    168                 $(MY_CFLAGS) $(MY_LDFLAGS) 
     170                $(MY_LDFLAGS) 
    169171 
    170172$(OUT_DIR)/pjsua2_wrap.o: $(OUT_DIR)/pjsua2_wrap.cpp Makefile 
Note: See TracChangeset for help on using the changeset viewer.