korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-23 18:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

AOSP: Define HAVE_SYS_SYSMACROS_H for Android.

Browse Source 
Also remove a duplicate copy of misc/create_inode.c that isn't upstream.

Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: Ibc475c82aa21f063673cb68bcf6e41ad9d821cd3
From AOSP commit: 37f805a9571cf33c95080c3dbd65c7a4e46fcd71

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Elliott Hughes 2017-05-19 12:49:54 -07:00 committed by Theodore Ts'o
parent 0df5f9290c
commit 7701f128ae
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugfs/Android.bp
View File

@ -23,7 +23,6 @@ cc_defaults {
"extent_cmds.c",
"extent_inode.c",
"zap.c",
"create_inode.c",
"quota.c",
"xattrs.c",
"journal.c",
@ -45,6 +44,7 @@ cc_defaults {
}
debugfs_libs = [
"libext2_misc",
"libext2fs",
"libext2_blkid",
"libext2_uuid",

2
misc/Android.bp
View File

@ -30,12 +30,12 @@ cc_binary {
"util.c",
"mk_hugefiles.c",
"default_profile.c",
"create_inode.c",
],
cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
shared_libs: [
"libext2fs",
"libext2_blkid",
"libext2_misc",
"libext2_uuid",
"libext2_quota",
"libext2_com_err",

1
util/android_config.h
View File

@ -65,4 +65,5 @@
# define HAVE_PREAD64 1
# define HAVE_PWRITE64 1
# define HAVE_SYS_PRCTL_H 1
# define HAVE_SYS_SYSMACROS_H 1
#endif

4
util/gen-android-files
View File

@ -7,7 +7,7 @@ ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \
lib/ext2fs/ext2_types.h lib/config.h lib/blkid/blkid.h \
lib/uuid/uuid.h lib/ext2fs/crc32c_table.h misc/default_profile.c \
lib/ss/std_rqs.c debugfs/debug_cmds.c debugfs/ro_debug_cmds.c \
debugfs/extent_cmds.c debugfs/e2freefrag.c debugfs/create_inode.c \
debugfs/extent_cmds.c debugfs/e2freefrag.c \
debugfs/recovery.c debugfs/revoke.c \
MODULE_LICENSE_GPL README.version"
@ -41,7 +41,7 @@ cp util/android_types.h lib/ext2fs/ext2_types.h
cp util/android_types.h lib/blkid/blkid_types.h
cp util/android_types.h lib/uuid/uuid_types.h
cp util/android_config.h lib/config.h
cp misc/e2freefrag.c misc/create_inode.c debugfs/
cp misc/e2freefrag.c debugfs/
cp e2fsck/recovery.c e2fsck/revoke.c debugfs/
gcc -o gen_crc32ctable lib/ext2fs/gen_crc32ctable.c