commit b090c66e8c55b7b14c7523e373e496c3bfdbffc4
author Yabin Cui <yabinc@google.com> Fri Feb 19 10:33:15 2016 -0800
committer Yabin Cui <yabinc@google.com> Tue Feb 23 10:57:12 2016 -0800
tree 2fd139145c87a0149c90f1836a00f96d88769288
parent 486435d2b28dec2fa18615051b0b9573ffc3ef0f

Fix inclusion of healthd.h.

Bug: 26879394
Change-Id: I5f04d631040ffc568a1e7d6e3248b39518eccd9c
(cherry picked from commit eb2cc0c5a92cf1125cc70311359395150e4f7737)

health/Android.mk

diff --git a/health/Android.mk b/health/Android.mk
index 0f83031..bf90216 100644
--- a/health/Android.mk
+++ b/health/Android.mk
@@ -15,12 +15,12 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES := system/core/healthd
-
 LOCAL_SRC_FILES := healthd-flounder.cpp
 
 LOCAL_MODULE := libhealthd.flounder
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_STATIC_LIBRARIES := libhealthd.default
+
 include $(BUILD_STATIC_LIBRARY)

health/healthd-flounder.cpp

diff --git a/health/healthd-flounder.cpp b/health/healthd-flounder.cpp
index d032d7b..971a902 100644
--- a/health/healthd-flounder.cpp
+++ b/health/healthd-flounder.cpp
@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "healthd-flounder"
-#include <healthd.h>
+#include <healthd/healthd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <cutils/klog.h>