diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-19 21:15:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 21:15:41 +0000 |
| commit | a0e300efae92d8155151e345034620054cff8955 (patch) | |
| tree | 1728e97892130b72073a50fa7bdb7a986e1a7545 /media | |
| parent | 4f346bf0ffe1c596ca261dfec23c50977de77d82 (diff) | |
| parent | 458edc8de368607a1cf831f7e8bb70047c8bf905 (diff) | |
| download | frameworks_base-a0e300efae92d8155151e345034620054cff8955.zip frameworks_base-a0e300efae92d8155151e345034620054cff8955.tar.gz frameworks_base-a0e300efae92d8155151e345034620054cff8955.tar.bz2 | |
am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit '458edc8de368607a1cf831f7e8bb70047c8bf905':
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 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 \ |