Add features to portability/Config.h

Summary: It is perfectly reasonable to need to feature macros when checking configuration, and the configuration is needed to know if features.h exists, so put it in the same file.

Reviewed By: yfeldblum

Differential Revision: D3072255

fb-gh-sync-id: 0f253dd1fa2f4a95adb11f11c45e6b86ef9c25bc
shipit-source-id: 0f253dd1fa2f4a95adb11f11c45e6b86ef9c25bc

folly/Portability.h

@@ -23,10 +23,6 @@
 
 #include <folly/portability/Config.h>
 
-#if FOLLY_HAVE_FEATURES_H
-#include <features.h>
-#endif
-
 #include <folly/CPortability.h>
 
 #ifdef __APPLE__

folly/portability/Config.h

@@ -23,3 +23,11 @@
 #ifdef FOLLY_PLATFORM_CONFIG
 #include FOLLY_PLATFORM_CONFIG
 #endif
+
+#if FOLLY_HAVE_FEATURES_H
+#include <features.h>
+#endif
+
+#ifdef __ANDROID__
+#include <android/api-level.h>
+#endif