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

android: updated build scripts

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-09-13 15:44:48 +02:00
parent a111f14119
commit 1b0cb40009
2 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
jni/Android.mk
View file

@ -1,9 +1,13 @@
root-dir:=$(APP_PROJECT_PATH) # script expect linphone-root-dir variable to be set by parent !
#default values #default values
BUILD_AMR=light BUILD_AMR=light
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
BUILD_X264=1 BUILD_X264=1
LINPHONE_VIDEO=1 LINPHONE_VIDEO=1
else
LINPHONE_VIDEO=0
BUILD_X264=0
endif endif
@ -11,93 +15,90 @@ endif
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
BUILD_SRTP=1 BUILD_SRTP=1
ZRTP_C_INCLUDE= \ ZRTP_C_INCLUDE= \
$(root-dir)/submodules/externals/libzrtpcpp/src $(linphone-root-dir)/submodules/externals/libzrtpcpp/src
endif endif
ifeq ($(BUILD_SRTP), 1) ifeq ($(BUILD_SRTP), 1)
SRTP_C_INCLUDE= \ SRTP_C_INCLUDE= \
$(root-dir)/submodules/externals/srtp/include \ $(linphone-root-dir)/submodules/externals/srtp/include \
$(root-dir)/submodules/externals/srtp/crypto/include $(linphone-root-dir)/submodules/externals/srtp/crypto/include
endif endif
#endif #endif
# Speex # Speex
ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/speex.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),)
include $(root-dir)/submodules/externals/build/speex/Android.mk include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk
else else
include $(root-dir)/submodules/externals/prebuilts/speex.mk include $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk
endif endif
# Gsm # Gsm
ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/gsm.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk),)
include $(root-dir)/submodules/externals/build/gsm/Android.mk include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
else else
include $(root-dir)/submodules/externals/prebuilts/gsm.mk include $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk
endif endif
include $(root-dir)/submodules/externals/build/exosip/Android.mk include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk
include $(root-dir)/submodules/externals/build/osip/Android.mk include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk
# Openssl # Openssl
ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/ssl.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),)
include $(root-dir)/submodules/externals/openssl/Android.mk include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
else else
include $(root-dir)/submodules/externals/prebuilts/ssl.mk include $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk
include $(root-dir)/submodules/externals/prebuilts/crypto.mk include $(linphone-root-dir)/submodules/externals/prebuilts/crypto.mk
endif endif
include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
include $(root-dir)/submodules/linphone/mediastreamer2/tests/Android.mk include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tests/Android.mk
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(root-dir)/submodules/msilbc/Android.mk include $(linphone-root-dir)/submodules/msilbc/Android.mk
ifeq ($(BUILD_X264), 1) ifeq ($(BUILD_X264), 1)
include $(root-dir)/submodules/msx264/Android.mk include $(linphone-root-dir)/submodules/msx264/Android.mk
ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/x264.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),)
include $(root-dir)/submodules/externals/build/x264/Android.mk include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
else else
include $(root-dir)/submodules/externals/prebuilts/x264.mk include $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk
endif endif
endif endif
ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/ffmpeg.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk),)
include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
else else
include $(root-dir)/submodules/externals/prebuilts/ffmpeg.mk include $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk
endif endif
endif #armeabi-v7a endif #armeabi-v7a
include $(root-dir)/submodules/externals/build/libvpx/Android.mk include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
ifeq ($(wildcard $(root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),)
include $(root-dir)/submodules/externals/build/libzrtpcpp/Android.mk include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
else else
include $(root-dir)/submodules/externals/prebuilts/zrtpcpp.mk include $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk
endif endif
endif endif
ifeq ($(BUILD_SRTP), 1) ifeq ($(BUILD_SRTP), 1)
include $(root-dir)/submodules/externals/build/srtp/Android.mk include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk
endif endif
include $(root-dir)/submodules/linphone/build/android/Android.mk include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
ifneq ($(BUILD_AMR), 0) ifneq ($(BUILD_AMR), 0)
include $(root-dir)/submodules/externals/build/opencore-amr/Android.mk include $(linphone-root-dir)/submodules/externals/build/opencore-amr/Android.mk
include $(root-dir)/submodules/msamr/Android.mk include $(linphone-root-dir)/submodules/msamr/Android.mk
endif endif

5
jni/Application.mk
View file

@ -3,7 +3,7 @@ APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2
APP_STL := stlport_static APP_STL := stlport_static
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc APP_MODULES +=libmsilbc
endif endif
ifeq ($(LINPHONE_VIDEO),1) ifeq ($(LINPHONE_VIDEO),1)
@ -36,8 +36,9 @@ APP_MODULES += libsrtp
endif endif
endif endif
linphone-root-dir:=$(APP_PROJECT_PATH)
APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
APP_PLATFORM := android-8 APP_PLATFORM := android-8
APP_ABI := armeabi armeabi-v7a APP_ABI := armeabi-v7a armeabi
APP_CFLAGS:=-DDISABLE_NEON APP_CFLAGS:=-DDISABLE_NEON