commit 559bf2836f5da25b75bfb229fec0d20d540ee426
author James Dong <jdong@google.com> Wed Mar 28 10:29:14 2012 -0700
committer Anatol Pomozov <anatol.pomozov@gmail.com> Wed Mar 28 12:07:41 2012 -0700
tree d7dd708b17eeca96a3e5d8bcc25a51ff3d1b5d0d
parent b0b2b4d890cf3bfb274797a759642b4e733343d7

AV Android make files changes

o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc

Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 4e9b4cf..5a73cdd 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -13,10 +13,10 @@
 
 # FIXME The duplicate audioflinger is temporary
 LOCAL_C_INCLUDES := \
-    frameworks/native/services/audioflinger \
-    frameworks/base/services/audioflinger \
-    frameworks/base/services/camera/libcameraservice \
-    frameworks/base/media/libmediaplayerservice
+    frameworks/av/media/libmediaplayerservice \
+    frameworks/av/services/audioflinger \
+    frameworks/av/services/camera/libcameraservice \
+    frameworks/native/services/audioflinger
 
 LOCAL_MODULE:= mediaserver