From 5eeb0cca3374c6f15bde076b2b80ed97b6445109 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Wed, 2 Sep 2015 19:07:46 -0700 Subject: [PATCH] libext2fs: export the library include path When adding 'libext2fs' as a library dependency from any other binary, the binary needs to find the library headers. Users of this library should not hard-code the include path themselves. This patch exports the library headers on all three version of the libext2fs library and removes the redundant include path from executables in e2fsprogs. Addresses-Google-Bug: #23084776 TEST=mma Signed-off-by: Theodore Ts'o --- e2fsck/Android.mk | 2 +- lib/ext2fs/Android.mk | 3 +++ misc/Android.mk | 8 ++------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index 30f2d55..6a1b604 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -52,7 +52,7 @@ e2fsck_static_libraries := \ e2fsck_system_static_libraries := libc -e2fsck_c_includes := external/e2fsprogs/lib +e2fsck_c_includes := e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk index dc197a1..6d9e041 100644 --- a/lib/ext2fs/Android.mk +++ b/lib/ext2fs/Android.mk @@ -110,6 +110,7 @@ LOCAL_SRC_FILES := $(libext2fs_src_files) LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2fs_system_shared_libraries) LOCAL_SHARED_LIBRARIES := $(libext2fs_shared_libraries) LOCAL_C_INCLUDES := $(libext2fs_c_includes) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes) LOCAL_CFLAGS := $(libext2fs_cflags) LOCAL_MODULE := libext2fs LOCAL_MODULE_TAGS := optional @@ -121,6 +122,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext2fs_src_files) LOCAL_STATIC_LIBRARIES := $(libext2fs_static_libraries) $(libext2fs_system_static_libraries) LOCAL_C_INCLUDES := $(libext2fs_c_includes) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes) LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux) LOCAL_MODULE := libext2fs LOCAL_MODULE_TAGS := optional @@ -132,6 +134,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext2fs_src_files) LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2fs_shared_libraries)) LOCAL_C_INCLUDES := $(libext2fs_c_includes) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes) LOCAL_CFLAGS := $(libext2fs_cflags) LOCAL_MODULE := libext2fs_host LOCAL_MODULE_TAGS := optional diff --git a/misc/Android.mk b/misc/Android.mk index 5ab5141..19344ff 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -10,7 +10,6 @@ mke2fs_src_files := \ create_inode.c mke2fs_c_includes := \ - external/e2fsprogs/lib \ external/e2fsprogs/e2fsck mke2fs_cflags := -O2 -g -W -Wall @@ -56,7 +55,6 @@ tune2fs_src_files := \ util.c tune2fs_c_includes := \ - external/e2fsprogs/lib \ external/e2fsprogs/e2fsck tune2fs_cflags := -O2 -g -W -Wall @@ -137,8 +135,7 @@ include $(CLEAR_VARS) badblocks_src_files := \ badblocks.c -badblocks_c_includes := \ - external/e2fsprogs/lib +badblocks_c_includes := badblocks_cflags := -O2 -g -W -Wall @@ -287,8 +284,7 @@ include $(CLEAR_VARS) blkid_src_files := \ blkid.c -blkid_c_includes := \ - external/e2fsprogs/lib +blkid_c_includes := blkid_cflags := -O2 -g -W -Wall -- 1.8.3.1