ext4_utils: use android_filesystem_capability.h

Change-Id: I47cb6ec2f1fcba0d076081b76335638b9c2d1789

diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
index 586e97e..3abbdc3 100644 (file)
--- a/ext4_utils/contents.c
+++ b/ext4_utils/contents.c
@@ -17,27 +17,15 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <stdio.h>
-#if defined(__linux__)
+
+#ifdef HAVE_ANDROID_OS
 #include <linux/capability.h>
-#include <linux/xattr.h>
 #else
-#include <stdint.h>
-#define VFS_CAP_FLAGS_EFFECTIVE  0x000001
-#define VFS_CAP_U32_2            2
-#define VFS_CAP_U32              VFS_CAP_U32_2
-#define VFS_CAP_REVISION_2       0x02000000
-#define VFS_CAP_REVISION         VFS_CAP_REVISION_2
-
-struct vfs_cap_data {
-       uint32_t magic_etc;
-       struct {
-               uint32_t permitted;
-               uint32_t inheritable;
-       } data[VFS_CAP_U32];
-};
+#include <private/android_filesystem_capability.h>
+#endif
+
 #define XATTR_SELINUX_SUFFIX "selinux"
 #define XATTR_CAPS_SUFFIX "capability"
-#endif /* !defined(__linux__) */
 
 #include "ext4_utils.h"
 #include "ext4.h"