summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-19 21:10:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 21:10:15 +0000
commitda47d79d34bd7a3d202b29a1a5b3852d7551cf56 (patch)
tree72a83dc16fdc4d1490e45d0cfa01faa4892fad89 /media/jni
parentcd9934cf03cd7bc1cfad94dad3b713da726e27dc (diff)
parenta3dc076d2dda77d8891fcd83f6f4056d15bbf2fc (diff)
downloadframeworks_base-da47d79d34bd7a3d202b29a1a5b3852d7551cf56.zip
frameworks_base-da47d79d34bd7a3d202b29a1a5b3852d7551cf56.tar.gz
frameworks_base-da47d79d34bd7a3d202b29a1a5b3852d7551cf56.tar.bz2
am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc': mediaeditor shouldn't depend on audioflinger.
Diffstat (limited to 'media/jni')
-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 \