From: Elliott Hughes <enh@google.com>
Date: Fri, 19 May 2017 19:49:54 +0000 (-0700)
Subject: AOSP: Define HAVE_SYS_SYSMACROS_H for Android.
X-Git-Tag: v1.44.0-rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7701f128aef57d256a5553f5f9f7fb06ca2c03c1;p=thirdparty%2Fe2fsprogs.git

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>
---

diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index 013a42182..7dfc7d3d8 100644
--- a/debugfs/Android.bp
+++ b/debugfs/Android.bp
@@ -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",
diff --git a/misc/Android.bp b/misc/Android.bp
index e36bf93db..ae7d9b6e3 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -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",
diff --git a/util/android_config.h b/util/android_config.h
index 9b09ce6b5..e6b25fa53 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 ebd8778b7..937496bca 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