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/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 675c563..f173e2e 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -7,6 +7,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=               \
+    ActivityManager.cpp         \
     Crypto.cpp                  \
     MediaRecorderClient.cpp     \
     MediaPlayerService.cpp      \
@@ -26,7 +27,6 @@
 	libmedia              			\
 	libmedia_native       			\
 	libcamera_client      			\
-	libandroid_runtime    			\
 	libstagefright        			\
 	libstagefright_omx    			\
 	libstagefright_foundation       \
@@ -40,8 +40,8 @@
 
 LOCAL_C_INCLUDES :=                                               \
 	$(call include-path-for, graphics corecg)                       \
-	$(TOP)/frameworks/base/media/libstagefright/include             \
-	$(TOP)/frameworks/base/media/libstagefright/rtsp                \
+	$(TOP)/frameworks/av/media/libstagefright/include               \
+	$(TOP)/frameworks/av/media/libstagefright/rtsp                  \
 	$(TOP)/frameworks/native/include/media/openmax                  \
 	$(TOP)/external/tremolo/Tremolo                                 \