summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-03-12 14:37:53 -0700
committerJames Dong <jdong@google.com>2012-03-12 21:28:57 -0700
commit6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb (patch)
tree307356be51d237ee22f88affdc3376270d571be9 /media/libmedia
parentaa4397f07c43bd83bc3100b749401dc3d15e7622 (diff)
downloadframeworks_av-6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb.zip
frameworks_av-6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb.tar.gz
frameworks_av-6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb.tar.bz2
Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/Android.mk2
-rw-r--r--media/libmedia/MediaProfiles.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 23670df..5ecc8f5 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -57,7 +57,7 @@ LOCAL_MODULE:= libmedia
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \
$(call include-path-for, graphics corecg) \
- $(TOP)/frameworks/base/include/media/stagefright/openmax \
+ $(TOP)/frameworks/native/include/media/openmax \
external/icu4c/common \
external/expat/lib \
system/media/audio_effects/include \
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index 93ddca8..9c46009 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -26,7 +26,7 @@
#include <expat.h>
#include <media/MediaProfiles.h>
#include <media/stagefright/foundation/ADebug.h>
-#include <media/stagefright/openmax/OMX_Video.h>
+#include <OMX_Video.h>
namespace android {