diff --git a/compile.sh b/compile.sh index 6ba5c26caf48a805fde781a846c2ba11ec41b0bd..511f3c112dfa8bd1202b5cf56319cc346cbfb2f9 100755 --- a/compile.sh +++ b/compile.sh @@ -231,7 +231,7 @@ echo ${PWD} which autopoint >/dev/null || make $MAKEFLAGS .gettext export PATH="$PATH:$PWD/../$TARGET_TUPLE/bin" -export SFLPHONE_BUILD_DIR=sflphone/build-android-${TARGET_TUPLE} +export SFLPHONE_BUILD_DIR=sflphone/daemon/build-android-${TARGET_TUPLE} ############ # Make SFLPHONE # ############ diff --git a/sflphone-android/jni/Android.mk b/sflphone-android/jni/Android.mk index 8710a942cede5b7084841a03a6b0b67b0d6e099f..38b788d7d4808a1dce2c2e99aaebc16dd39ee1a0 100644 --- a/sflphone-android/jni/Android.mk +++ b/sflphone-android/jni/Android.mk @@ -35,7 +35,7 @@ $(info SFLPHONE_SRC=$(SFLPHONE_SRC)) include $(CLEAR_VARS) LOCAL_MODULE := sflphone -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/.libs/libsflphone.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/.libs/libsflphone.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -63,9 +63,10 @@ LOCAL_CPPFLAGS += -fexceptions LOCAL_SRC_FILES := sflphone_wrapper.cpp LOCAL_C_INCLUDES += $(LOCAL_PATH) \ + $(SFLPHONE_BUILD_DIR)/ \ # for config.h $(SFLPHONE_SRC)/daemon \ $(SFLPHONE_SRC)/daemon/src \ - $(SFLPHONE_SRC)/contrib/$(TARGET_TUPLE)/include + $(SFLPHONE_SRC)/daemon/contrib/$(TARGET_TUPLE)/include LOCAL_MODULE := libsflphonejni @@ -88,8 +89,8 @@ LOCAL_LDLIBS += -lz \ -llog \ -lOpenSLES \ -L$(SFLPHONE_CONTRIB)/lib \ - -L$(SFLPHONE_SRC)/daemon/src/.libs \ - $(SFLPHONE_SRC)/daemon/src/.libs/libsflphone.a \ + -L$(SFLPHONE_BUILD_DIR)/src/.libs \ + $(SFLPHONE_BUILD_DIR)/src/.libs/libsflphone.a \ -lexpat -lhogweed -lpj-arm-unknown-linux-androideabi \ -lpjsip-simple-arm-unknown-linux-androideabi \ -lpjlib-util-arm-unknown-linux-androideabi \ @@ -115,45 +116,45 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ulaw -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_ulaw.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_ulaw.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := alaw -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_alaw.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_alaw.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := g722 -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_g722.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_g722.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := speex_nb -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_speex_nb.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_speex_nb.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := speex_ub -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_speex_ub.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_speex_ub.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := speex_wb -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_speex_wb.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_speex_wb.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := opus -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_opus.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_opus.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := gsm -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_gsm.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_gsm.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := g729 -LOCAL_SRC_FILES := $(SFLPHONE_SRC)/daemon/src/audio/codecs/libcodec_g729.so +LOCAL_SRC_FILES := ../$(SFLPHONE_BUILD_DIR)/src/audio/codecs/libcodec_g729.so include $(PREBUILT_SHARED_LIBRARY) diff --git a/sflphone-android/jni/jni_interface.i b/sflphone-android/jni/jni_interface.i index 28359b860bcd76561b5669453a7b33636aded373..f14e7640b6f78159718eeb92fb175f4647896ef3 100644 --- a/sflphone-android/jni/jni_interface.i +++ b/sflphone-android/jni/jni_interface.i @@ -67,7 +67,6 @@ namespace std { /* not parsed by SWIG but needed by generated C files */ %header %{ -#include <logger.h> #include <functional> %}