Update Android make for AMR-WB integration

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 944f2361196c5e746111fc28e29f959c92fc8792..346b57350c628238bcece6e06d06afa06dd88f21 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -105,15 +105,28 @@ endif
 endif
 
 
+_BUILD_AMR=0
+ifneq ($(BUILD_AMRNB), 0)
+_BUILD_AMR=1
+endif
+
+ifneq ($(BUILD_AMRWB), 0)
+_BUILD_AMR=1
+endif
 
-ifneq ($(BUILD_AMR),0)
+ifneq ($(_BUILD_AMR), 0)
 LOCAL_CFLAGS += -DHAVE_AMR
+LOCAL_STATIC_LIBRARIES += \
+        libmsamr \
+        libopencoreamr
+endif
 
+ifneq ($(BUILD_AMRWB), 0)
 LOCAL_STATIC_LIBRARIES += \
-       libmsamr \
-       libopencoreamr 
+       libvoamrwbenc
 endif
 
+
 ifeq ($(BUILD_SILK),1)
 LOCAL_CFLAGS += -DHAVE_SILK
 LOCAL_STATIC_LIBRARIES += libmssilk