From b1013968b952f82abd64224d66e3da6159d036ed Mon Sep 17 00:00:00 2001
From: Naseer Ahmed <naseer@codeaurora.org>
Date: Mon, 2 Apr 2018 17:28:51 -0400
Subject: [PATCH] display: More fixes for VNDK

Change-Id: I8887ffdde3d6f39f9405dd38e8eaedbb8da2a9b4
---
 Android.bp                | 1 +
 gpu_tonemapper/Android.mk | 2 +-
 gralloc/service.cpp       | 1 -
 libqdutils/Android.bp     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index ef4b3af8..7a6b5b61 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,7 @@ cc_defaults {
 
 cc_library_headers {
     name: "display_headers",
+    vendor_available: true,
     export_include_dirs: [
         "include",
         "libcopybit",
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 89bad794..6c6ccd16 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -13,7 +13,7 @@ LOCAL_VENDOR_MODULE       := true
 LOCAL_MODULE_TAGS         := optional
 LOCAL_C_INCLUDES          := $(TARGET_OUT_HEADERS)/qcom/display/
 LOCAL_C_INCLUDES          += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SHARED_LIBRARIES    := libEGL libGLESv2 libui libutils liblog
+LOCAL_SHARED_LIBRARIES    := libEGL libGLESv2 libGLESv3 libui libutils liblog
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
 
 LOCAL_CFLAGS              := $(version_flag) -Wno-missing-field-initializers -Wall \
diff --git a/gralloc/service.cpp b/gralloc/service.cpp
index b19cc884..5832386b 100644
--- a/gralloc/service.cpp
+++ b/gralloc/service.cpp
@@ -26,7 +26,6 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <binder/ProcessState.h>
 #include <hidl/LegacySupport.h>
 #include "QtiAllocator.h"
 
diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp
index 24b0c77e..a6b6ec34 100644
--- a/libqdutils/Android.bp
+++ b/libqdutils/Android.bp
@@ -2,7 +2,7 @@ cc_library_shared {
     name: "libqdutils",
     vendor: true,
     defaults: ["display_defaults"],
-    header_libs: ["libhardware_headers"],
+    header_libs: ["libhardware_headers", "libutils_headers"],
     shared_libs: [
         "libbinder",
         "libqservice",