commit 0e9350254736c4aea154a7a871dd212038050f70
author Glenn Kasten <gkasten@google.com> Tue Mar 13 16:09:39 2012 -0700
committer Glenn Kasten <gkasten@google.com> Tue Mar 13 16:13:17 2012 -0700
tree a3a6f653b383e5767c6ed6b6c47c464099339298
parent f67fdc6d8bb31226ffeeecbff6aca610befd0110

Prepare frameworks/native/services/audioflinger

Part of this change will be reverted after the move is complete.

Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d

media/mediaserver/Android.mk

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 @@
 	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