summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-18 08:33:38 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-10-18 08:33:38 -0700
commit8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9 (patch)
tree5ba561315eff765e4a434ae56c55c3648defe5ec /media/libmediaplayerservice
parent3e00cc070090fa3eab16792da90aa33823cd6db1 (diff)
parent06fa2bcce5dd80b406a23f980d8c9fac1524ebfd (diff)
downloadframeworks_av-8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9.zip
frameworks_av-8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9.tar.gz
frameworks_av-8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9.tar.bz2
Merge fb474872 from gingerbread-plus-aosp
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index e1edd16..55846be 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -53,7 +53,7 @@ endif
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \
$(call include-path-for, graphics corecg) \
- $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
+ $(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/media/libstagefright/include \
$(TOP)/frameworks/base/media/libstagefright/rtsp \
$(TOP)/external/tremolo/Tremolo