Changeset 6120 for pjproject/trunk/pjsip-apps/src/samples/android_sample/jni/Android.mk

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/samples/android_sample/jni/Android.mk (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/samples/android_sample/jni/Android.mk

@@ -2 +2 @@
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := dummy_static
-LOCAL_SRC_FILES := dummy.c
-
+LOCAL_SRC_FILES := dummy.c dummy2.cc
 include $(BUILD_STATIC_LIBRARY)
 
@@ -11 +9 @@
 LOCAL_MODULE    := dummy_shared
 LOCAL_STATIC_LIBRARIES := dummy_static
-LOCAL_SRC_FILES := dummy.c
-
+LOCAL_SRC_FILES := dummy.c dummy2.cc
 include $(BUILD_SHARED_LIBRARY)