From e7650ea727152f15d87ad871c44c626f031c2893 Mon Sep 17 00:00:00 2001
From: Naseer Ahmed <naseer@codeaurora.org>
Date: Tue, 27 Mar 2018 19:53:30 -0400
Subject: [PATCH] display: VNDK header fixes

Change-Id: Id7604ac803e49940aa2b49e106b414b4be1a25ad
---
 Android.bp                | 2 ++
 liblight/Android.mk       | 1 +
 libmemtrack/Android.mk    | 1 +
 libqdutils/Android.bp     | 1 +
 libqservice/IQService.cpp | 2 +-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index b1e6afd4..ef4b3af8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,6 +28,8 @@ cc_library_headers {
         "sdm/include",
         "gralloc",
     ],
+    header_libs: ["libhardware_headers"],
+    export_header_lib_headers: ["libhardware_headers"],
 }
 
 subdirs = [
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 197a1a42..cf53b2c4 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -23,6 +23,7 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/qdcm/inc
 LOCAL_SRC_FILES := lights.c lights_prv.cpp
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libsdm-disp-vndapis
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\"
 ifeq ($(LLVM_SA), true)
     LOCAL_CFLAGS += --compile-and-analyze --analyzer-perf --analyzer-Werror
diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
index d4014bb9..10fd40a9 100644
--- a/libmemtrack/Android.mk
+++ b/libmemtrack/Android.mk
@@ -24,6 +24,7 @@ LOCAL_C_INCLUDES += hardware/libhardware/include
 LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion
 LOCAL_CLANG  := true
 LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_SRC_FILES := memtrack_msm.c kgsl.c
 LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp
index a32162fb..24b0c77e 100644
--- a/libqdutils/Android.bp
+++ b/libqdutils/Android.bp
@@ -2,6 +2,7 @@ cc_library_shared {
     name: "libqdutils",
     vendor: true,
     defaults: ["display_defaults"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "libbinder",
         "libqservice",
diff --git a/libqservice/IQService.cpp b/libqservice/IQService.cpp
index 2d0cbfbd..d45a141c 100644
--- a/libqservice/IQService.cpp
+++ b/libqservice/IQService.cpp
@@ -25,8 +25,8 @@
 #include <binder/IBinder.h>
 #include <binder/IInterface.h>
 #include <binder/IPCThreadState.h>
+#include <cutils/android_filesystem_config.h>
 #include <utils/Errors.h>
-#include <private/android_filesystem_config.h>
 #include <IQService.h>
 
 #define QSERVICE_DEBUG 0