From 22399089ef071d03d5e1591ae00512243f2d13ec Mon Sep 17 00:00:00 2001 From: Christopher Wiley Date: Tue, 12 Apr 2016 09:21:51 -0700 Subject: [PATCH] healthd: Explicitly reference headers from libbinder When creating static libs with healthd logic, explicitly reference libbinder to pick up its header include paths. Bug: 27804373 Test: healthd libs compile when libbinder's header include paths change. Change-Id: I1014eb0b73d06815c42a527c4ea7e63c35ca3530 --- healthd/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/healthd/Android.mk b/healthd/Android.mk index ddd9f1f02..d8668875d 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE := libhealthd.default LOCAL_CFLAGS := -Werror LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_STATIC_LIBRARIES := libbinder include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -15,7 +16,7 @@ LOCAL_SRC_FILES := BatteryMonitor.cpp LOCAL_MODULE := libbatterymonitor LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libutils +LOCAL_STATIC_LIBRARIES := libutils libbinder include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS)