diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-05-07 21:59:21 +0300 |
|---|---|---|
| committer | osm0sis <osm0sis@outlook.com> | 2017-08-05 02:39:33 +0300 |
| commit | 883df49edbdad0d5a690ac10092d766e7a319578 (patch) | |
| tree | 6a66591e2b0a191a3fa92d205b7e01f8abd577e0 | |
| parent | e8e1e6c7b8a9305c7eb1623fa5b8ce82b913c2c8 (diff) | |
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
Conflicts:
libcutils/include/private/android_filesystem_config.h
Resolution: Correct path
| -rw-r--r-- | private/android_filesystem_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/private/android_filesystem_config.h b/private/android_filesystem_config.h index d3228771..f91b8f96 100644 --- a/private/android_filesystem_config.h +++ b/private/android_filesystem_config.h @@ -54,7 +54,7 @@ #include <sys/types.h> #include <stdint.h> -#if defined(__ANDROID__) +#if defined(__BIONIC__) #include <linux/capability.h> #else #include "android_filesystem_capability.h" |