commit 737325fb7c0231eb530c75b7ea21466308fd3ea1
author Elliott Hughes <enh@google.com> Tue Feb 16 18:34:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 16 18:34:24 2016 +0000
tree 37b0d5f7827fd37b9b61d20d62bd44df851d5c01
parent ae2b746c8274845c64d2d62ddc8f3a0b07a05f35
parent 8dccdbf3f80cafcc0e1c3fc55bf03b1b8c5c2b1c

Merge "Move libdiskconfig headers into libdiskconfig."

libdiskconfig/Android.mk

diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk
index 624e385..a49ce58 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -13,6 +13,8 @@
 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_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

libdiskconfig/include/diskconfig/diskconfig.h

diff --git a/include/diskconfig/diskconfig.h b/libdiskconfig/include/diskconfig/diskconfig.h
similarity index 100%
rename from include/diskconfig/diskconfig.h
rename to libdiskconfig/include/diskconfig/diskconfig.h