diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-14 13:56:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-14 13:56:25 -0700 |
| commit | 8e5b72c39cf0e4d4bec6f843bb54f6409b073c64 (patch) | |
| tree | db5db6697bf2a34fd3ebf117269bf4c5ffe7f03f /media/mediaserver | |
| parent | d191213ab0146526541913f3fed2d5aa95f58899 (diff) | |
| parent | 0e9350254736c4aea154a7a871dd212038050f70 (diff) | |
| download | frameworks_av-8e5b72c39cf0e4d4bec6f843bb54f6409b073c64.zip frameworks_av-8e5b72c39cf0e4d4bec6f843bb54f6409b073c64.tar.gz frameworks_av-8e5b72c39cf0e4d4bec6f843bb54f6409b073c64.tar.bz2 | |
Merge "Prepare frameworks/native/services/audioflinger"
Diffstat (limited to 'media/mediaserver')
| -rw-r--r-- | media/mediaserver/Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 0559812..4e9b4cf 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -11,12 +11,12 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder -base := $(LOCAL_PATH)/../.. - +# FIXME The duplicate audioflinger is temporary LOCAL_C_INCLUDES := \ - $(base)/services/audioflinger \ - $(base)/services/camera/libcameraservice \ - $(base)/media/libmediaplayerservice + frameworks/native/services/audioflinger \ + frameworks/base/services/audioflinger \ + frameworks/base/services/camera/libcameraservice \ + frameworks/base/media/libmediaplayerservice LOCAL_MODULE:= mediaserver |