diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-05-07 21:20:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-07 21:20:35 +0000 |
| commit | 8e5c7bf6233e3515fc7024f16726d706cdc6508c (patch) | |
| tree | 6af3705e679839b927f2bacaee96e75d69dc827d /libcutils | |
| parent | b832f991e05dc2466bd513282785ee4f62ea913e (diff) | |
| parent | c27f7911b1493349180a1dadc7eb20ae3b5a9a1c (diff) | |
| download | system_core-8e5c7bf6233e3515fc7024f16726d706cdc6508c.tar.gz system_core-8e5c7bf6233e3515fc7024f16726d706cdc6508c.tar.bz2 system_core-8e5c7bf6233e3515fc7024f16726d706cdc6508c.zip | |
Merge "Assume bionic has up-to-date linux/capability.h" am: 1445c4b932 am: c09d16234f
am: c27f7911b1
Change-Id: Ib66ee19c79c85fccd9dcf419891f99b751957c23
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/include/private/android_filesystem_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 <sys/cdefs.h> #include <sys/types.h> -#if defined(__ANDROID__) +#if defined(__BIONIC__) #include <linux/capability.h> #else #include "android_filesystem_capability.h" |