Merge branch 'CSipSimple' into 'master'

Update CSipSimple

See merge request !566
This commit is contained in:
Boris Kraut 2015-02-20 19:31:48 +00:00
commit f81a570623

View file

@ -43,6 +43,27 @@ Build:1.02.01-2417,2417
build=make
buildjni=no
Build:1.02.03-2459,2459
commit=2460
subdir=CSipSimple
srclibs=codec2-dev@1486,pjsip@4978,portaudio@1433,webrtc@2948,libyuv@426
forceversion=yes
target=android-21
prebuild=sed -i 's/MY_USE_SILK := 1/MY_USE_SILK := 0/' jni/Application.mk && \
sed -i 's/ silk//' Makefile && \
sed -i '/silk/d' jni/Android.mk && \
sed -i 's/ic_launcher_nightly/ic_launcher_phone/' AndroidManifest.xml && \
sed -i 's/nightly/release/' AndroidManifest.xml && \
cp -r $$codec2-dev$$ jni/codec2/sources && \
cp -r $$pjsip$$ jni/pjsip/sources && \
cp -r $$portaudio$$ jni/pjsip/sources/third_party/portaudio && \
cp -r $$webrtc$$ jni/webrtc/sources && \
cp -r $$libyuv$$ jni/third_party/libyuv
scanignore=CSipSimple/jni/webrtc/sources/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java,CSipSimple/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
ndk=r10d
build=PATH=$PATH:$$NDK$$ make NDK_ROOT=$$NDK$$
buildjni=no
Maintainer Notes:
DexClassLoader used to load htc front-facing camera jar on HTC Evo devices.
Does not break the app on other devices nor on HTC Evo devices that don't have