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/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk
index b47cb1e..0ad3f6c 100644
--- a/media/libstagefright/codecs/aacenc/Android.mk
+++ b/media/libstagefright/codecs/aacenc/Android.mk
@@ -1,6 +1,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-include frameworks/base/media/libstagefright/codecs/common/Config.mk
+include frameworks/av/media/libstagefright/codecs/common/Config.mk
@@ -64,9 +64,9 @@
LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := \
- frameworks/base/media/libstagefright/include \
- frameworks/base/media/libstagefright/codecs/common/include \
- frameworks/base/include \
+ frameworks/av/include \
+ frameworks/av/media/libstagefright/include \
+ frameworks/av/media/libstagefright/codecs/common/include \
$(LOCAL_PATH)/src \
$(LOCAL_PATH)/inc \
$(LOCAL_PATH)/basic_op
@@ -94,8 +94,8 @@
SoftAACEncoder.cpp
LOCAL_C_INCLUDES := \
- frameworks/base/media/libstagefright/include \
- frameworks/base/media/libstagefright/codecs/common/include \
+ frameworks/av/media/libstagefright/include \
+ frameworks/av/media/libstagefright/codecs/common/include \
frameworks/native/include/media/openmax
LOCAL_CFLAGS := -DOSCL_IMPORT_REF=