summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-19 14:05:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 14:05:23 -0700
commita3dc076d2dda77d8891fcd83f6f4056d15bbf2fc (patch)
tree167579304d21e465665a6e998efdb6d927c283ce /media
parent240d56386377f3bcd554a2cc07e0c3e336103c86 (diff)
parentbfc440923ecb8f32448c675095a2096049fe7ebe (diff)
downloadframeworks_base-a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc.zip
frameworks_base-a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc.tar.gz
frameworks_base-a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc.tar.bz2
am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit 'bfc440923ecb8f32448c675095a2096049fe7ebe': mediaeditor shouldn't depend on audioflinger.
Diffstat (limited to 'media')
-rw-r--r--media/jni/mediaeditor/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk
index 6be7fdd..5d2378d 100644
--- a/media/jni/mediaeditor/Android.mk
+++ b/media/jni/mediaeditor/Android.mk
@@ -48,7 +48,6 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
- libaudioflinger \
libaudioutils \
libbinder \
libcutils \