From 0de03b53fcf8c5807abbfc71d082f3b9cad031fa Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Sun, 7 May 2017 11:59:21 -0700 Subject: [PATCH] Assume bionic has up-to-date linux/capability.h The fallback android_filesystem_capability.h doesn't play nicely with other kernel headers, since it #undef's __user. If we're building with bionic (either for device or host), we use the same kernel headers, so just use those. Bug: 38056396 Test: build with Host_bionic:true Change-Id: Idc61b6d96d86891164abe71604924638d67aefe2 --- libcutils/include/private/android_filesystem_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcutils/include/private/android_filesystem_config.h b/libcutils/include/private/android_filesystem_config.h index bbba8536e..fdead2379 100644 --- a/libcutils/include/private/android_filesystem_config.h +++ b/libcutils/include/private/android_filesystem_config.h @@ -53,7 +53,7 @@ #include #include -#if defined(__ANDROID__) +#if defined(__BIONIC__) #include #else #include "android_filesystem_capability.h"