summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec
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/libstagefright/codecs/aacdec
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/libstagefright/codecs/aacdec')
-rw-r--r--media/libstagefright/codecs/aacdec/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk
index fd6de79..b4445a7 100644
--- a/media/libstagefright/codecs/aacdec/Android.mk
+++ b/media/libstagefright/codecs/aacdec/Android.mk
@@ -147,7 +147,7 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO -DOSCL_IMPORT_REF= -DOSCL_EXPORT_REF= -DOSCL_UNUSED_ARG=
LOCAL_C_INCLUDES := \
- frameworks/base/media/libstagefright/include \
+ frameworks/av/media/libstagefright/include \
LOCAL_ARM_MODE := arm
@@ -163,7 +163,7 @@ LOCAL_SRC_FILES := \
SoftAAC.cpp
LOCAL_C_INCLUDES := \
- frameworks/base/media/libstagefright/include \
+ frameworks/av/media/libstagefright/include \
frameworks/native/include/media/openmax
LOCAL_CFLAGS := -DOSCL_IMPORT_REF=