diff --git a/jni/Android.mk b/jni/Android.mk index 438143319..07efba1cd 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -22,16 +22,32 @@ endif #endif - +# Speex +ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/speex.mk),) include $(root-dir)/submodules/externals/build/speex/Android.mk +else +include $(root-dir)/submodules/externals/prebuilts/speex.mk +endif +# Gsm +ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/gsm.mk),) include $(root-dir)/submodules/externals/build/gsm/Android.mk +else +include $(root-dir)/submodules/externals/prebuilts/gsm.mk +endif include $(root-dir)/submodules/externals/build/exosip/Android.mk include $(root-dir)/submodules/externals/build/osip/Android.mk +# Openssl +ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/ssl.mk),) include $(root-dir)/submodules/externals/openssl/Android.mk +else +include $(root-dir)/submodules/externals/prebuilts/ssl.mk +include $(root-dir)/submodules/externals/prebuilts/crypto.mk +endif + include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk @@ -45,15 +61,28 @@ include $(root-dir)/submodules/msilbc/Android.mk ifeq ($(BUILD_X264), 1) include $(root-dir)/submodules/msx264/Android.mk +ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/x264.mk),) include $(root-dir)/submodules/externals/build/x264/Android.mk +else +include $(root-dir)/submodules/externals/prebuilts/x264.mk +endif endif + +ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/ffmpeg.mk),) include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk +else +include $(root-dir)/submodules/externals/prebuilts/ffmpeg.mk +endif endif #armeabi-v7a ifeq ($(BUILD_GPLV3_ZRTP), 1) +ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),) include $(root-dir)/submodules/externals/build/libzrtpcpp/Android.mk +else +include $(root-dir)/submodules/externals/prebuilts/zrtpcpp.mk +endif endif ifeq ($(BUILD_SRTP), 1)