diff options
| author | Nick Kralevich <nnk@google.com> | 2013-03-01 22:14:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-01 22:14:53 +0000 |
| commit | 14a973e351171e004217829c617be4390ef54085 (patch) | |
| tree | 2e96f5c43c2edc0e3b7bd38bb1d327a94f4b1cbe | |
| parent | c5eebe72414012194e0e521476d99436c71f4bb1 (diff) | |
| parent | 26ebd81c1d73d7ce77e1c0cb5ac67c6d2ba4f004 (diff) | |
| download | extras-14a973e351171e004217829c617be4390ef54085.tar.gz | |
am 26ebd81c: Merge "ext4_utils: use android_filesystem_capability.h"
* commit '26ebd81c1d73d7ce77e1c0cb5ac67c6d2ba4f004':
ext4_utils: use android_filesystem_capability.h
| -rw-r--r-- | ext4_utils/contents.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c index 586e97e6..3abbdc35 100644 --- 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" |