summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Android.mk
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-03-28 10:29:14 -0700
committerAnatol Pomozov <anatol.pomozov@gmail.com>2012-03-28 12:07:41 -0700
commit559bf2836f5da25b75bfb229fec0d20d540ee426 (patch)
treed7dd708b17eeca96a3e5d8bcc25a51ff3d1b5d0d /media/libmediaplayerservice/Android.mk
parentb0b2b4d890cf3bfb274797a759642b4e733343d7 (diff)
downloadframeworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.zip
frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.tar.gz
frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.tar.bz2
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
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
-rw-r--r--media/libmediaplayerservice/Android.mk6
1 files changed, 3 insertions, 3 deletions
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 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
+ ActivityManager.cpp \
Crypto.cpp \
MediaRecorderClient.cpp \
MediaPlayerService.cpp \
@@ -26,7 +27,6 @@ LOCAL_SHARED_LIBRARIES := \
libmedia \
libmedia_native \
libcamera_client \
- libandroid_runtime \
libstagefright \
libstagefright_omx \
libstagefright_foundation \
@@ -40,8 +40,8 @@ LOCAL_STATIC_LIBRARIES := \
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 \