Changeset 4704 for pjproject/trunk/configure-android

Timestamp:

Jan 16, 2014 5:30:46 AM (10 years ago)

Author:

ming

Message:

Closed #1723: Merging pjsua2 branch into trunk

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• configure-android (modified) (2 diffs)

pjproject/trunk/configure-android

@@ -102 +102 @@
   export LIBS="${LIBS} -lc -lgcc"
   export CFLAGS="${NDK_CFLAGS} ${CFLAGS}"
-  export CPPFLAGS="${CFLAGS}"
-  export CXXFLAGS="${NDK_CXXFLAGS}"
+  export CPPFLAGS="${CFLAGS} -fexceptions -frtti"
+  export CXXFLAGS="${NDK_CXXFLAGS} -fexceptions -frtti"
 
 else
@@ -128 +128 @@
   export LIBS="${LIBS} -lc -lgcc"
   export CFLAGS="${CFLAGS} -I${ANDROID_SYSROOT}/usr/include"
-  export CPPFLAGS="${CFLAGS}"
-  export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT}"
+  export CPPFLAGS="${CFLAGS} -fexceptions -frtti"
+  export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT} -fexceptions -frtti"
 
 fi
+
+# C++ STL
+# Note: STL for pjsua2 sample app is specified in pjsip-apps/src/swig/java/android/jni/Application.mk
+
+# gnustl
+STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1`
+STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/armeabi/include"
+STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lgnustl_static"
+STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/armeabi"
+
+# stlport
+#STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport"
+#STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lstlport_static -ldl"
+#STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi"
+
+export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}"
+export LIBS="${STDCPP_LIBS} ${LIBS}"
+export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}"
 
 # Print settings