diff options
| author | Elliott Hughes <enh@google.com> | 2017-05-19 12:49:54 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-23 23:18:28 -0400 |
| commit | 7701f128aef57d256a5553f5f9f7fb06ca2c03c1 (patch) | |
| tree | 8e2f2186d3653c82970d319fb2fab7d8b230ffa9 /util | |
| parent | 0df5f9290c2a4013799b38bfd8a24aeed37b34df (diff) | |
| download | e2fsprogs-7701f128aef57d256a5553f5f9f7fb06ca2c03c1.tar.gz | |
AOSP: Define HAVE_SYS_SYSMACROS_H for Android.
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>
Diffstat (limited to 'util')
| -rw-r--r-- | util/android_config.h | 1 | ||||
| -rwxr-xr-x | util/gen-android-files | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/util/android_config.h b/util/android_config.h index 9b09ce6b..e6b25fa5 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -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 diff --git a/util/gen-android-files b/util/gen-android-files index ebd8778b..937496bc 100755 --- a/util/gen-android-files +++ b/util/gen-android-files @@ -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 |