release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779 snap-temp-L47900000064949209
Change-Id: I41dd053299af77f6d92e1c110f1a74e96e99ab20
diff --git a/ISV/Android.mk b/ISV/Android.mk
index 168b532..b12f23a 100644
--- a/ISV/Android.mk
+++ b/ISV/Android.mk
@@ -28,6 +28,10 @@
libmedia \
libsync \
+LOCAL_HEADER_LIBRARIES := \
+ libsystem_headers \
+ libnativebase_headers
+
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
system/core/libsync/include \
diff --git a/ISV/base/isv_bufmanager.cpp b/ISV/base/isv_bufmanager.cpp
index 8e5aa2d..0b2c8bf 100644
--- a/ISV/base/isv_bufmanager.cpp
+++ b/ISV/base/isv_bufmanager.cpp
@@ -19,6 +19,8 @@
#include <media/hardware/HardwareAPI.h>
#include <system/graphics.h>
+#include <nativebase/nativebase.h>
+
#include "isv_bufmanager.h"
#ifndef TARGET_VPP_USE_GEN
#include "hal_public.h"
diff --git a/ISV/base/isv_worker.cpp b/ISV/base/isv_worker.cpp
index 9cddd1c..4549dc0 100644
--- a/ISV/base/isv_worker.cpp
+++ b/ISV/base/isv_worker.cpp
@@ -16,6 +16,8 @@
*/
#include <cutils/properties.h>
#include <system/graphics.h>
+#include <nativebase/nativebase.h>
+
#include "isv_worker.h"
#ifndef TARGET_VPP_USE_GEN
#include <hal_public.h>
diff --git a/ISV/include/isv_bufmanager.h b/ISV/include/isv_bufmanager.h
index 7b0bfb0..4b19f85 100644
--- a/ISV/include/isv_bufmanager.h
+++ b/ISV/include/isv_bufmanager.h
@@ -141,6 +141,8 @@
#endif
};
+struct ANativeWindowBuffer;
+
class ISVBufferManager: public RefBase
{
public:
diff --git a/ISV/omx/isv_omxcomponent.cpp b/ISV/omx/isv_omxcomponent.cpp
index 043da1b..de31e22 100644
--- a/ISV/omx/isv_omxcomponent.cpp
+++ b/ISV/omx/isv_omxcomponent.cpp
@@ -23,6 +23,7 @@
#include "isv_profile.h"
#include <OMX_IndexExt.h>
#include <hal_public.h>
+#include <nativebase/nativebase.h>
#include "OMX_adaptor.h"
