Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove prebuilts, better use the awsome ccache.

Browse source
This commit is contained in:
Guillaume Beraudo 2013-06-18 09:37:49 +02:00
parent 26694587f8
commit 92ba15cfc2
1 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
jni/Android.mk
View file

@ -49,31 +49,17 @@ include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk
endif endif
# Speex # Speex
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),)
include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk
else
include $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk
endif
# Gsm # Gsm
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk),)
include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
else
include $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk
endif
include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk
include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk
# Openssl # Openssl
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),)
include $(linphone-root-dir)/submodules/externals/openssl/Android.mk include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
else
include $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk
include $(linphone-root-dir)/submodules/externals/prebuilts/crypto.mk
endif
include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
@ -101,19 +87,11 @@ ifeq (,$(DUMP_VAR))
$(info Build X264 plugin for mediastreamer2) $(info Build X264 plugin for mediastreamer2)
endif endif
include $(linphone-root-dir)/submodules/msx264/Android.mk include $(linphone-root-dir)/submodules/msx264/Android.mk
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),)
include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
else
include $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk
endif
endif endif
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk),)
include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk
else
include $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk
endif
include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
endif #armeabi-v7a endif #armeabi-v7a
@ -123,11 +101,7 @@ ifeq ($(BUILD_GPLV3_ZRTP), 1)
ifeq (,$(DUMP_VAR)) ifeq (,$(DUMP_VAR))
$(info Build ZRTP support - makes application GPLv3) $(info Build ZRTP support - makes application GPLv3)
endif endif
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),)
include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
else
include $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk
endif
endif endif
ifeq ($(BUILD_SRTP), 1) ifeq ($(BUILD_SRTP), 1)