commit dd093ebdbcb116216c73da28e0b5b727dbddfdb9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 18:35:18 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 18:35:18 2018 +0000
tree c63b3118ee9d288a000a309a5af53c2677e17f76
parent 5dbd292484741430d3f562a268d5c9f782a4af1e
parent 4725422874f070e9b8ee71bcd75806f34b856963

Merge changes Ia517b85f,Ia7b9db53 into pi-dev

* changes:
  Make liblight build with the VNDK.
  Make libqservice build with the VNDK.

liblight/Android.mk

diff --git a/liblight/Android.mk b/liblight/Android.mk
index 3912b3f..9fcf7e7 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -23,6 +23,7 @@
 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

libqservice/IQService.cpp

diff --git a/libqservice/IQService.cpp b/libqservice/IQService.cpp
index 2d0cbfb..d45a141 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