commit ae8f50e226ed5d2747849eacba49404cae6bee2b
author Mohamad Ayyash <mkayyash@google.com> Fri May 13 18:22:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 13 18:22:25 2016 +0000
tree 0e1473d8efe3e1dd0aff5e2f8962e4dbb1a3e2b5
parent bee7ab66fd1b07bfc3613a865d87c93439fc673c
parent 07ec5db9d57fe659b4934f57d695189d75f70c4b

Fix definition of android_filesystem_capability in xattr
am: 07ec5db9d5

* commit '07ec5db9d57fe659b4934f57d695189d75f70c4b':
  Fix definition of android_filesystem_capability in xattr

Change-Id: Ie4ebb9b575f806d1953b8a5e3ef3803f48c67d27

squashfs-tools/android.c

diff --git a/squashfs-tools/android.c b/squashfs-tools/android.c
index 2b156ea..7bba052 100644
--- a/squashfs-tools/android.c
+++ b/squashfs-tools/android.c
@@ -29,7 +29,6 @@
 
 #include "android.h"
 #include "private/android_filesystem_config.h"
-#include "private/android_filesystem_capability.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 

squashfs-tools/xattr.c

diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c
index c6dba62..6cecb74 100644
--- a/squashfs-tools/xattr.c
+++ b/squashfs-tools/xattr.c
@@ -61,7 +61,11 @@
 /* ANDROID CHANGES START*/
 #ifdef ANDROID
 #include "android.h"
-#include "private/android_filesystem_capability.h"
+#ifdef __ANDROID__
+#include <linux/capability.h>
+#else
+#include <private/android_filesystem_capability.h>
+#endif
 static struct selabel_handle *sehnd = NULL;
 #endif
 /* ANDROID CHANGES END */