summaryrefslogtreecommitdiffstats
path: root/libstagefrighthw
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-03-12 13:42:28 -0700
committerJames Dong <jdong@google.com>2012-03-12 20:38:08 -0700
commit8174ff45beba26d5f82bea0aa95177f47a39339e (patch)
tree1fce228b61d6ac701ab909d6097a68b44bd10fe6 /libstagefrighthw
parentc9316f02e09f2aead4b6ca056c60c0764c00c63e (diff)
downloaddevice_samsung_crespo-8174ff45beba26d5f82bea0aa95177f47a39339e.zip
device_samsung_crespo-8174ff45beba26d5f82bea0aa95177f47a39339e.tar.gz
device_samsung_crespo-8174ff45beba26d5f82bea0aa95177f47a39339e.tar.bz2
Switched to use header files from /frameworks/native
o related-to-bug: 6044887 Change-Id: If4a56cd53bf910d2db7a30e836bdafb7837bdba4
Diffstat (limited to 'libstagefrighthw')
-rw-r--r--libstagefrighthw/Android.mk3
-rw-r--r--libstagefrighthw/SEC_OMX_Plugin.cpp2
-rw-r--r--libstagefrighthw/SEC_OMX_Plugin.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 3598451..052050c 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -9,7 +9,8 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY)
LOCAL_C_INCLUDES:= \
- $(TOP)/frameworks/base/include/media/stagefright/openmax \
+ $(TOP)/frameworks/native/include/media/openmax \
+ $(TOP)/frameworks/native/include/media/hardware \
$(LOCAL_PATH)/../include \
LOCAL_SHARED_LIBRARIES := \
diff --git a/libstagefrighthw/SEC_OMX_Plugin.cpp b/libstagefrighthw/SEC_OMX_Plugin.cpp
index 82497aa..8347c63 100644
--- a/libstagefrighthw/SEC_OMX_Plugin.cpp
+++ b/libstagefrighthw/SEC_OMX_Plugin.cpp
@@ -18,7 +18,7 @@
#include <dlfcn.h>
-#include <media/stagefright/HardwareAPI.h>
+#include <HardwareAPI.h>
namespace android {
diff --git a/libstagefrighthw/SEC_OMX_Plugin.h b/libstagefrighthw/SEC_OMX_Plugin.h
index 6df2d31..3d640db 100644
--- a/libstagefrighthw/SEC_OMX_Plugin.h
+++ b/libstagefrighthw/SEC_OMX_Plugin.h
@@ -18,7 +18,7 @@
#define SEC_OMX_PLUGIN
-#include <media/stagefright/OMXPluginBase.h>
+#include <OMXPluginBase.h>
namespace android {