From 3b6136435b37d31180d2b16d5f9fd6c4b9c23c1d Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 13 Jul 2015 17:14:21 -0700 Subject: Wrap tune2fs.h to be C++ compatible. (cherry picked from commit b0af72276f654c4d5f9bd0756802115a83437b82) Change-Id: I42c72c04e95b82530ec889f956980034a0b52953 --- misc/tune2fs.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/misc/tune2fs.h b/misc/tune2fs.h index 897e3363..7b7e431e 100644 --- a/misc/tune2fs.h +++ b/misc/tune2fs.h @@ -7,7 +7,20 @@ * %End-Header% */ +#ifndef _TUNE2FS_H_ +#define _TUNE2FS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + /* Takes exactly the same args as the tune2fs exectuable. * Is the entrypoint for libtune2fs. */ int tune2fs_main(int argc, char **argv); + +#ifdef __cplusplus +} +#endif + +#endif -- cgit v1.2.3 From 939e1c9c5f14884e16e31e3f57aaaa796aab26d9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 2 Jun 2015 21:03:49 -0700 Subject: package version metadata for external/ This will be used for automated notification of external vulnerability reports. Change-Id: Ia0fd8cf39ffc69072c5503cf8bedde4d9c413f64 (cherry picked from commit ecb2a1e0c5b6cc6d8c974f3fc1629bf68b3a9693) --- README.version | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.version diff --git a/README.version b/README.version new file mode 100644 index 00000000..851c4e84 --- /dev/null +++ b/README.version @@ -0,0 +1,3 @@ +URL: https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.42.9/e2fsprogs-1.42.9.tar.gz +Version: 1.42.9 +BugComponent: 95221 -- cgit v1.2.3 From a87fa1b351938a2f8dc47bed1012beead0fa25fd Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Wed, 2 Sep 2015 19:07:46 -0700 Subject: 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. Bug: b/23084776 TEST=mma Change-Id: Idfbfcd2b671a9cddd08c322bc916a5efcc3cffe1 (cherry picked from commit 941ca9e47429b8e0ee86b7b72ca0a107ddc09d22) --- e2fsck/Android.mk | 6 +++--- lib/ext2fs/Android.mk | 3 +++ misc/Android.mk | 18 +++++++----------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index b4b2aef9..afae91fa 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -37,7 +37,7 @@ libext2_profile_cflags := -O2 -g -W -Wall \ -DHAVE_LINUX_FD_H \ -DHAVE_TYPE_SSIZE_T \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF \ -DDISABLE_BACKTRACE=1 @@ -106,7 +106,7 @@ e2fsck_shared_libraries := \ libext2_e2p e2fsck_system_shared_libraries := libc -e2fsck_c_includes := external/e2fsprogs/lib +e2fsck_c_includes := e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing \ -DHAVE_DIRENT_H \ @@ -136,7 +136,7 @@ e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing \ -DHAVE_INTPTR_T \ -DENABLE_HTREE=1 \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF \ -DDISABLE_BACKTRACE=1 diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk index 467ca7e0..4755ade9 100644 --- a/lib/ext2fs/Android.mk +++ b/lib/ext2fs/Android.mk @@ -124,6 +124,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) $(libext2fs_cflags_linux) LOCAL_MODULE := libext2fs LOCAL_MODULE_TAGS := optional @@ -135,6 +136,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 @@ -146,6 +148,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) ifeq ($(HOST_OS),linux) LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux) else diff --git a/misc/Android.mk b/misc/Android.mk index 645fc9cc..b5af5c23 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -8,7 +8,6 @@ mke2fs_src_files := \ default_profile.c mke2fs_c_includes := \ - external/e2fsprogs/lib \ external/e2fsprogs/e2fsck mke2fs_cflags := -O2 -g -W -Wall \ @@ -32,7 +31,7 @@ mke2fs_cflags := -O2 -g -W -Wall \ -DHAVE_TYPE_SSIZE_T \ -DHAVE_GETOPT_H \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF mke2fs_cflags_linux := \ @@ -89,7 +88,6 @@ tune2fs_src_files := \ util.c tune2fs_c_includes := \ - external/e2fsprogs/lib \ external/e2fsprogs/e2fsck tune2fs_cflags := -O2 -g -W -Wall \ @@ -117,7 +115,7 @@ tune2fs_cflags := -O2 -g -W -Wall \ -DHAVE_TYPE_SSIZE_T \ -DHAVE_GETOPT_H \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF tune2fs_cflags += -DNO_CHECK_BB @@ -198,8 +196,7 @@ include $(CLEAR_VARS) badblocks_src_files := \ badblocks.c -badblocks_c_includes := \ - external/e2fsprogs/lib +badblocks_c_includes := badblocks_cflags := -O2 -g -W -Wall \ -DHAVE_UNISTD_H \ @@ -226,7 +223,7 @@ badblocks_cflags := -O2 -g -W -Wall \ -DHAVE_TYPE_SSIZE_T \ -DHAVE_GETOPT_H \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF badblocks_shared_libraries := \ @@ -298,7 +295,7 @@ chattr_cflags := -O2 -g -W -Wall \ -DHAVE_TYPE_SSIZE_T \ -DHAVE_GETOPT_H \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF chattr_shared_libraries := \ @@ -367,7 +364,7 @@ lsattr_cflags := -O2 -g -W -Wall \ -DHAVE_TYPE_SSIZE_T \ -DHAVE_GETOPT_H \ -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H \ + -DHAVE_SYS_PARAM_H \ -DHAVE_SYSCONF lsattr_shared_libraries := \ @@ -408,8 +405,7 @@ include $(CLEAR_VARS) blkid_src_files := \ blkid.c -blkid_c_includes := \ - external/e2fsprogs/lib +blkid_c_includes := blkid_cflags := -O2 -g -W -Wall \ -DHAVE_UNISTD_H \ -- cgit v1.2.3 From 28f4418af5eb870fbee94a3183ff56534a5329d4 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Tue, 8 Sep 2015 21:18:58 -0700 Subject: Sync libext2fs sources in Android.mk with Makefile.in The Makefile.in lists all the objects included in the libext2fs library by default and includes some additional objects based on the configure time flags. This patch syncs the list of source files in Android.mk with the list of object files in Makefile.in with the addition of dumpfs.c (included when configured with --enable-resizer) and leaving out crc32c.c since it relies on generated tables that depend on the endianness of the target. Bug: 23084776 Change-Id: Ie228900250f1a4965d622c5f85fd86afb8360585 Test: mmma external/e2fsprogs; mmma system/update_engine (cherry picked from commit 62296a90db05af4abab0031b60287bafcb1db0ff) --- lib/ext2fs/Android.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk index 4755ade9..fd7bb85b 100644 --- a/lib/ext2fs/Android.mk +++ b/lib/ext2fs/Android.mk @@ -16,9 +16,9 @@ libext2fs_src_files := \ block.c \ bmap.c \ check_desc.c \ + closefs.c \ crc16.c \ csum.c \ - closefs.c \ dblist.c \ dblist_dir.c \ dirblock.c \ @@ -48,26 +48,29 @@ libext2fs_src_files := \ link.c \ llseek.c \ lookup.c \ - mmp.c \ mkdir.c \ mkjournal.c \ + mmp.c \ + namei.c \ native.c \ newdir.c \ openfs.c \ progress.c \ punch.c \ - rbtree.c \ + qcow2.c \ read_bb.c \ read_bb_file.c \ res_gdt.c \ rw_bitmaps.c \ swapfs.c \ + symlink.c \ tdb.c \ undo_io.c \ unix_io.c \ unlink.c \ valid_blk.c \ - version.c + version.c \ + rbtree.c # get rid of this?! libext2fs_src_files += test_io.c -- cgit v1.2.3