jni: fix build

Contrib path moved, and linking flags changed.

Refs #56330

Makefile

@@ -10,7 +10,6 @@ LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h
 LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so
 
 JAVA_SOURCES=$(shell find $(SRC)/src/org/sflphone/ -type f -name "*.java")
-JNI_SOURCES=$(SRC)/jni/*.cpp $(SRC)/jni/*.h
 
 ifneq ($(V),)
 ANT_OPTS += -v
@@ -40,14 +39,14 @@ $(SFLPHONE_APK): $(LIBSFLPHONEJNI) $(JAVA_SOURCES)
 	git rev-parse --short HEAD > $(SRC)/assets/revision.txt
 	$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
 
-$(LIBSFLPHONEJNI): $(JNI_SOURCES) $(LIBSFLPHONEJNI_H)
+$(LIBSFLPHONEJNI): $(LIBSFLPHONEJNI_H)
 	@if [ -z "$(SFLPHONE_BUILD_DIR)" ]; then echo "SFLPHONE_BUILD_DIR not defined" ; exit 1; fi
 	@if [ -z "$(ANDROID_NDK)" ]; then echo "ANDROID_NDK not defined" ; exit 1; fi
 	@echo
 	@echo "=== Building libsflphonejni ==="
 	@echo
 	$(VERBOSE)if [ -z "$(SFLPHONE_SRC_DIR)" ] ; then SFLPHONE_SRC_DIR=./sflphone; fi ; \
-	if [ -z "$(SFLPHONE_CONTRIB)" ] ; then SFLPHONE_CONTRIB="$$SFLPHONE_SRC_DIR/contrib/$(TARGET_TUPLE)"; fi ; \
+	if [ -z "$(SFLPHONE_CONTRIB)" ] ; then SFLPHONE_CONTRIB="$$SFLPHONE_SRC_DIR/daemon/contrib/$(TARGET_TUPLE)"; fi ; \
 	if [ `echo "$(SFLPHONE_BUILD_DIR)" | head -c 1` != "/" ] ; then \
         SFLPHONE_BUILD_DIR="../$(SFLPHONE_BUILD_DIR)"; \
 	fi ; \
@@ -67,7 +66,7 @@ lightclean:
 	cd $(SRC) && rm -rf libs/armeabi-v7a libs/x86 libs/mips obj bin $(SFLPHONE_APK)
 
 clean: lightclean
-	rm -rf $(SRC)/gen java-libs/*/gen java-libs/*/bin .sdk vlc-sdk/ vlc-sdk.7z
+	rm -rf $(SRC)/gen java-libs/*/gen java-libs/*/bin .sdk
 
 jniclean: lightclean
 	rm -f $(LIBSFLPHONEJNI)

compile.sh

@@ -96,7 +96,7 @@ ANDROID_PATH="`pwd`"
 if [ ! -z "$FETCH" ]
 then
     # 1/ libsflphone
-    TESTED_HASH=994088d0589970782fb1ebc7dea1276217d39c10
+    TESTED_HASH=7104605dd2e7739a1973cee3bbb0fffcfd360bbd
     if [ ! -d "sflphone" ]; then
         echo "sflphone daemon source not found, cloning"
         git clone https://gerrit-sflphone.savoirfairelinux.com/sflphone

sflphone-android/jni/Android.mk

@@ -95,7 +95,7 @@ LOCAL_LDLIBS  += 	-lz \
 					-lpjsip-simple-arm-unknown-linux-androideabi \
      				-lpjlib-util-arm-unknown-linux-androideabi \
     				-lpjsip-ua-arm-unknown-linux-androideabi \
-					-lspeexdsp -lvorbisfile \
+					-lspeexdsp -lvorbisfile -lyaml-cpp \
 					-lavdevice -lFLAC \
      				-liax -lsrtp-arm-unknown-linux-androideabi \
  					-lvpx -lavfilter -lgcrypt -lnettle \
@@ -103,7 +103,7 @@ LOCAL_LDLIBS  += 	-lz \
          			-lpjsua2-arm-unknown-linux-androideabi \
       				-lswscale -lx264 -lavformat -lgmp \
     				-logg -lpjmedia-audiodev-arm-unknown-linux-androideabi \
-					-lpjsua-arm-unknown-linux-androideabi -lucommon -lyaml \
+					-lpjsua-arm-unknown-linux-androideabi -lucommon \
 					-lavresample -lgnutls -lopus \
       				-lpjmedia-codec-arm-unknown-linux-androideabi \
 					-lresample-arm-unknown-linux-androideabi -lusecure \