commit d495b11548c0625fc662bfcfb772198888d6df33
author Mathias Agopian <mathias@google.com> Thu May 11 12:00:09 2017 -0700
committer Mathias Agopian <mathias@google.com> Thu May 11 14:50:07 2017 -0700
tree 6f92d84c9a0861dde675cb9be414466afc3aa85c
parent 3d9c7fd95b997880c8e60c44f1bb7ae921253ce4

fix circular dependency libnativewindow <-> libui

Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: Id2ae321762f6c98e943c7483d68941bf3b4ae765

ISV/Android.mk

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 \

ISV/base/isv_bufmanager.cpp

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"

ISV/base/isv_worker.cpp

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>

ISV/include/isv_bufmanager.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:

ISV/omx/isv_omxcomponent.cpp

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"