From d964a2516783eed76b916415db2c2339745c3134 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 26 Jan 2012 15:59:03 +0100 Subject: [PATCH] Update Android make for AMR-WB integration --- build/android/Android.mk | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 944f23611..346b57350 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -105,15 +105,28 @@ endif endif - -ifneq ($(BUILD_AMR),0) -LOCAL_CFLAGS += -DHAVE_AMR - -LOCAL_STATIC_LIBRARIES += \ - libmsamr \ - libopencoreamr +_BUILD_AMR=0 +ifneq ($(BUILD_AMRNB), 0) +_BUILD_AMR=1 endif +ifneq ($(BUILD_AMRWB), 0) +_BUILD_AMR=1 +endif + +ifneq ($(_BUILD_AMR), 0) +LOCAL_CFLAGS += -DHAVE_AMR +LOCAL_STATIC_LIBRARIES += \ + libmsamr \ + libopencoreamr +endif + +ifneq ($(BUILD_AMRWB), 0) +LOCAL_STATIC_LIBRARIES += \ + libvoamrwbenc +endif + + ifeq ($(BUILD_SILK),1) LOCAL_CFLAGS += -DHAVE_SILK LOCAL_STATIC_LIBRARIES += libmssilk