From 17853e10d74e466aeb1a7749853c2562482a5bf9 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 28 Jun 2010 23:01:19 +0200 Subject: [PATCH] add multi arch compile + msilbc for armv7 --- jni/Android.mk | 6 +++++- jni/Application.mk | 4 ++++ submodules/linphone | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 0c64e525b..2c48606fe 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -12,7 +12,11 @@ include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk -#include $(root-dir)/submodules/msilbc/Android.mk +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +include $(root-dir)/submodules/msilbc/Android.mk +endif + + include $(root-dir)/submodules/linphone/build/android/Android.mk diff --git a/jni/Application.mk b/jni/Application.mk index e70813aa5..e48e8da65 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,8 @@ APP_PROJECT_PATH := $(call my-dir)/../ APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +APP_MODULES +=libmsilbc +endif APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk APP_PLATFORM := android-3 +APP_ABI := armeabi armeabi-v7a diff --git a/submodules/linphone b/submodules/linphone index fc856b97a..94fdd26f2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fc856b97ae7e6c8f7346d7a108b20cf73a9fa0f1 +Subproject commit 94fdd26f225d63a2be2fb2bb1ef4e27275431ac7