commit 4c16017c016864864ceb5dce8c4c22faabc7f62a
author Dima Zavin <dima@android.com> Tue Apr 03 00:52:31 2012 -0700
committer Dima Zavin <dima@android.com> Tue Apr 17 21:50:28 2012 -0700
tree 79e3a986a00acd75b7009a7ed42e340051a80b21
parent 31fb3958615de90a5af67e73a292fb44d24f0fe0

fix libstagefrighthw to build

Change-Id: I1c175c79cf6118b49907a8cd1e08dac8972c4b46
Signed-off-by: Dima Zavin <dima@android.com>

libstagefrighthw/Android.mk

diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 0424d6a..a8af63c 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -21,7 +21,9 @@
 LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY)
 
 LOCAL_C_INCLUDES:= \
-      $(TOP)/frameworks/base/include/media/stagefright/openmax \
+      frameworks/native/include/media/hardware \
+      frameworks/native/include/media/openmax \
+      frameworks/native/include
 
 LOCAL_SHARED_LIBRARIES :=    \
         libbinder            \
@@ -29,7 +31,7 @@
         libcutils            \
         libui                \
         libdl                \
-        libsurfaceflinger_client
+        libstagefright_foundation
 
 LOCAL_MODULE := libstagefrighthw
 

libstagefrighthw/Exynos_OMX_Plugin.cpp

diff --git a/libstagefrighthw/Exynos_OMX_Plugin.cpp b/libstagefrighthw/Exynos_OMX_Plugin.cpp
index b103a5d..7a9849e 100644
--- a/libstagefrighthw/Exynos_OMX_Plugin.cpp
+++ b/libstagefrighthw/Exynos_OMX_Plugin.cpp
@@ -18,8 +18,8 @@
 
 #include <dlfcn.h>
 
-#include <media/stagefright/HardwareAPI.h>
-#include <media/stagefright/MediaDebug.h>
+#include <media/hardware/HardwareAPI.h>
+#include <media/stagefright/foundation/ADebug.h>
 
 namespace android {
 

libstagefrighthw/Exynos_OMX_Plugin.h

diff --git a/libstagefrighthw/Exynos_OMX_Plugin.h b/libstagefrighthw/Exynos_OMX_Plugin.h
index 7a7944c..3b4d8f0 100644
--- a/libstagefrighthw/Exynos_OMX_Plugin.h
+++ b/libstagefrighthw/Exynos_OMX_Plugin.h
@@ -18,7 +18,7 @@
 
 #define Exynos_OMX_PLUGIN
 
-#include <media/stagefright/OMXPluginBase.h>
+#include <media/hardware/OMXPluginBase.h>
 
 namespace android {