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
diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk
index 73336ef..f97ba57 100644
--- a/media/libmediaplayerservice/nuplayer/Android.mk
+++ b/media/libmediaplayerservice/nuplayer/Android.mk
@@ -13,10 +13,10 @@
StreamingSource.cpp \
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/base/media/libstagefright/httplive \
- $(TOP)/frameworks/base/media/libstagefright/include \
- $(TOP)/frameworks/base/media/libstagefright/mpeg2ts \
- $(TOP)/frameworks/base/media/libstagefright/rtsp \
+ $(TOP)/frameworks/av/media/libstagefright/httplive \
+ $(TOP)/frameworks/av/media/libstagefright/include \
+ $(TOP)/frameworks/av/media/libstagefright/mpeg2ts \
+ $(TOP)/frameworks/av/media/libstagefright/rtsp \
$(TOP)/frameworks/native/include/media/openmax
LOCAL_MODULE:= libstagefright_nuplayer