Export libsquashfs_utils include path in the library.

When using the libsquashfs_utils we need to include its only header, so
exposing the include path for this library avoids repeating the path
when using it. This patch also removes the include path from the only
call site (libfec).

Bug: None.
Change-Id: I82380b89652f758e4f33a0dc90650b04223c0940

diff --git a/libfec/Android.mk b/libfec/Android.mk
index da60fcc..47ac556 100644 (file)
--- a/libfec/Android.mk
+++ b/libfec/Android.mk
@@ -6,8 +6,7 @@ common_cflags := -Wall -Werror -O3 -D_LARGEFILE64_SOURCE
 
 common_c_includes := \
     $(LOCAL_PATH)/include \
-    external/fec \
-    system/extras/squashfs_utils
+    external/fec
 
 common_src_files := \
     fec_open.cpp \

diff --git a/squashfs_utils/Android.mk b/squashfs_utils/Android.mk
index b7dbcd5..b80da09 100644 (file)
--- a/squashfs_utils/Android.mk
+++ b/squashfs_utils/Android.mk
@@ -6,6 +6,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := squashfs_utils.c
 LOCAL_STATIC_LIBRARIES := libcutils
 LOCAL_C_INCLUDES := external/squashfs-tools/squashfs-tools
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_MODULE := libsquashfs_utils
 include $(BUILD_STATIC_LIBRARY)
 
@@ -13,6 +14,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := squashfs_utils.c
 LOCAL_STATIC_LIBRARIES := libcutils
 LOCAL_C_INCLUDES := external/squashfs-tools/squashfs-tools
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE -DSQUASHFS_NO_KLOG
 LOCAL_MODULE := libsquashfs_utils
 include $(BUILD_HOST_STATIC_LIBRARY)