summaryrefslogtreecommitdiffstats
path: root/cmds/stagefright
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 /cmds/stagefright
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 'cmds/stagefright')
-rw-r--r--cmds/stagefright/Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index e41b666..30be7fa 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \
SineSource.cpp
LOCAL_SHARED_LIBRARIES := \
- libstagefright libmedia libutils libbinder libstagefright_foundation \
+ libstagefright libmedia libmedia_native libutils libbinder libstagefright_foundation \
libskia libgui
LOCAL_C_INCLUDES:= \
@@ -108,7 +108,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libgui \
- libstagefright_foundation libmedia
+ libstagefright_foundation libmedia libmedia_native
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
@@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libstagefright_foundation \
- libmedia libgui libcutils libui
+ libmedia libmedia_native libgui libcutils libui
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
@@ -157,7 +157,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libstagefright_foundation \
- libmedia libgui libcutils libui
+ libmedia libmedia_native libgui libcutils libui
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \