Merge "Move libdiskconfig headers into libdiskconfig."

2016-02-16 18:34:24 +00:00 · 2016-02-16 18:34:24 +00:00 · 737325fb7c
parent ae2b746c82 8dccdbf3f8
commit 737325fb7c
2 changed files with 4 additions and 0 deletions
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@ -13,6 +13,8 @@ LOCAL_MODULE := libdiskconfig
 LOCAL_MODULE_TAGS := optional
 LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
 LOCAL_CFLAGS := -Werror
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 include $(BUILD_SHARED_LIBRARY)

 ifeq ($(HOST_OS),linux)
@ -21,5 +23,7 @@ LOCAL_SRC_FILES := $(commonSources)
 LOCAL_MODULE := libdiskconfig_host
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 include $(BUILD_HOST_STATIC_LIBRARY)
 endif # HOST_OS == linux
--- a/libdiskconfig/include/diskconfig/diskconfig.h
+++ b/libdiskconfig/include/diskconfig/diskconfig.h