summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-19 21:10:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 21:10:41 +0000
commit458edc8de368607a1cf831f7e8bb70047c8bf905 (patch)
treebc92279a8c7b5943e67a3db3f3393bb25b36c559 /media
parentff1e1d99ea029197051b3cdaa39effc6baa94b53 (diff)
parenta3dc076d2dda77d8891fcd83f6f4056d15bbf2fc (diff)
downloadframeworks_base-458edc8de368607a1cf831f7e8bb70047c8bf905.zip
frameworks_base-458edc8de368607a1cf831f7e8bb70047c8bf905.tar.gz
frameworks_base-458edc8de368607a1cf831f7e8bb70047c8bf905.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')
-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 \