diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-19 21:22:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 21:22:09 +0000 |
| commit | 29427a224e78068ade12bbabcf5613ce9cd48bfc (patch) | |
| tree | 67e19893ea1c1648f7b5835891557150fe3fb743 /media | |
| parent | 5341f881e0372c1c2af570d42fbe61a6500f315c (diff) | |
| parent | a0e300efae92d8155151e345034620054cff8955 (diff) | |
| download | frameworks_base-29427a224e78068ade12bbabcf5613ce9cd48bfc.zip frameworks_base-29427a224e78068ade12bbabcf5613ce9cd48bfc.tar.gz frameworks_base-29427a224e78068ade12bbabcf5613ce9cd48bfc.tar.bz2 | |
am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit 'a0e300efae92d8155151e345034620054cff8955':
mediaeditor shouldn't depend on audioflinger.
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/mediaeditor/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 76e8346..312c366 100644 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -47,7 +47,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ - libaudioflinger \ libaudioutils \ libbinder \ libcutils \ |