summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-03-21 07:03:25 -0700
committerThe Android Automerger <android-build@android.com>2012-03-21 07:03:25 -0700
commit66c85d703e3e5a68febeba966a6a125d302b7226 (patch)
tree3e440350f22bf1491dd8137ca45bd73aba18e946
parentd6024345f461f757df3d493c622e68b07199a2c0 (diff)
downloadvoip-66c85d703e3e5a68febeba966a6a125d302b7226.tar.gz
merge in jb-release history after reset to master
-rw-r--r--jni/rtp/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/jni/rtp/Android.mk b/jni/rtp/Android.mk
index 49b711d..d725713 100644
--- a/jni/rtp/Android.mk
+++ b/jni/rtp/Android.mk
@@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libmedia \
+ libmedia_native \
libstagefright_amrnb_common
LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc