summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-19 16:21:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-19 16:21:04 -0700
commit1bb8e81b066a2311fd238fc6dae8f026e33ed99e (patch)
treeb532516a844ab20331120a4d6f7777c27c36548c /media/libstagefright
parent1746929ddc7592ab397c402724a61352e45df093 (diff)
parentb12153e36ae5e514d96c77d660b327d1a8f5000f (diff)
downloadframeworks_av-1bb8e81b066a2311fd238fc6dae8f026e33ed99e.zip
frameworks_av-1bb8e81b066a2311fd238fc6dae8f026e33ed99e.tar.gz
frameworks_av-1bb8e81b066a2311fd238fc6dae8f026e33ed99e.tar.bz2
Merge "Add libmedia_native"
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 047b4cb..77714f3 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -79,6 +79,7 @@ LOCAL_SHARED_LIBRARIES := \
libicuuc \
liblog \
libmedia \
+ libmedia_native \
libsonivox \
libssl \
libstagefright_omx \