summaryrefslogtreecommitdiff
path: root/include/private/android_filesystem_config.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-07-30 16:50:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-30 16:50:15 +0000
commit145afc2cc4f973a4ad63aeabe5b0f633c8e99cec (patch)
tree43391eef0509bc8627b09a5b11326ff3c043fac1 /include/private/android_filesystem_config.h
parentc6dbc85845e58464541bb0644ebd570c44841a4c (diff)
parentfb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f (diff)
am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f': Use __ANDROID__ instead of HAVE_ANDROID_OS.
Diffstat (limited to 'include/private/android_filesystem_config.h')
-rw-r--r--include/private/android_filesystem_config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index a49da8cd4..b943e2c05 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -26,7 +26,7 @@
#include <sys/types.h>
#include <stdint.h>
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
#include <linux/capability.h>
#else
#include "android_filesystem_capability.h"