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

fix build without AMR

Browse source
This commit is contained in:
Jehan Monnier 2011-07-01 15:47:26 +02:00
parent f7ebf6133e
commit f1449c9897
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="1104" android:versionName="1.1.4" android:installLocation="auto"> android:versionCode="1105" android:versionName="1.1.5" android:installLocation="auto">
<uses-sdk android:minSdkVersion="3" /> <uses-sdk android:minSdkVersion="3" />

4
jni/Android.mk
View file

@ -1,7 +1,6 @@
root-dir:=$(APP_PROJECT_PATH) root-dir:=$(APP_PROJECT_PATH)
#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
@ -9,6 +8,7 @@ else
BUILD_X264=0 BUILD_X264=0
endif endif
include $(root-dir)/submodules/externals/build/speex/Android.mk include $(root-dir)/submodules/externals/build/speex/Android.mk
include $(root-dir)/submodules/externals/build/gsm/Android.mk include $(root-dir)/submodules/externals/build/gsm/Android.mk

16
jni/Application.mk
View file

@ -2,20 +2,30 @@ APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone
#APP_STL := stlport_static #APP_STL := stlport_static
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc
endif
ifneq ($(LINPHONE_VIDEO),0)
APP_MODULES += libavutil libavcore libavcodec libswscale
endif
ifneq ($(BUILD_AMR),0)
APP_MODULES += libopencoreamr libmsamr APP_MODULES += libopencoreamr libmsamr
endif
ifeq ($(WITH_OPENSSL),1) ifeq ($(WITH_OPENSSL),1)
APP_MODULES += libcrypto libssl APP_MODULES += libcrypto libssl
endif endif
ifneq ($(BUILD_X264),0)
APP_MODULES +=libx264 libmsx264
endif
ifeq ($(RING),yes) ifeq ($(RING),yes)
APP_MODULES += libring APP_MODULES += libring
endif endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264
endif
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 armeabi-v7a

2
submodules/linphone

@ -1 +1 @@
Subproject commit c8f4f8f296baa01f5839104327f1707626b7cf63 Subproject commit 999e7c141076fea1ed2ddc2444273ef37c426096