summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-10-30 10:59:52 -0700
committerGlenn Kasten <gkasten@google.com>2012-10-30 10:59:52 -0700
commitb24a1b7f99c4ada2fe45a670962afdf1ddd7f67b (patch)
treead9764e82e2590fbce0f27ba4593a3043bd19a94 /media
parent2bb40c91d2a51d4dbc8d571bde34659456ba239f (diff)
downloadframeworks_base-b24a1b7f99c4ada2fe45a670962afdf1ddd7f67b.zip
frameworks_base-b24a1b7f99c4ada2fe45a670962afdf1ddd7f67b.tar.gz
frameworks_base-b24a1b7f99c4ada2fe45a670962afdf1ddd7f67b.tar.bz2
Remove obsolete references to libmedia_native
Bug: 6654403 Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
Diffstat (limited to 'media')
-rw-r--r--media/jni/Android.mk1
-rw-r--r--media/jni/audioeffect/Android.mk3
-rw-r--r--media/jni/soundpool/Android.mk3
-rw-r--r--media/mca/filterfw/Android.mk3
4 files changed, 3 insertions, 7 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 6294704..6aaab22 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -24,7 +24,6 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
libbinder \
libmedia \
- libmedia_native \
libskia \
libui \
libcutils \
diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk
index 0059bb2..b5d8b7b 100644
--- a/media/jni/audioeffect/Android.mk
+++ b/media/jni/audioeffect/Android.mk
@@ -10,8 +10,7 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
libandroid_runtime \
libnativehelper \
- libmedia \
- libmedia_native
+ libmedia
LOCAL_C_INCLUDES := \
$(call include-path-for, audio-effects)
diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk
index 160666b..9b11bfa 100644
--- a/media/jni/soundpool/Android.mk
+++ b/media/jni/soundpool/Android.mk
@@ -9,8 +9,7 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
libandroid_runtime \
libnativehelper \
- libmedia \
- libmedia_native
+ libmedia
LOCAL_MODULE:= libsoundpool
diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk
index b822e99..1d69799 100644
--- a/media/mca/filterfw/Android.mk
+++ b/media/mca/filterfw/Android.mk
@@ -39,8 +39,7 @@ LOCAL_SHARED_LIBRARIES := libstlport \
libutils \
libandroid \
libjnigraphics \
- libmedia \
- libmedia_native
+ libmedia
# Don't prelink this library. For more efficient code, you may want
# to add this library to the prelink map and set this to true. However,