commit 989d804859cea2712875a38a7a99d623d4000dd0
author Dan Albert <danalbert@google.com> Thu Jan 18 19:38:50 2018 +0000
committer Dan Albert <danalbert@google.com> Thu Jan 18 23:39:48 2018 +0000
tree c237d742b2d1136ff551f48c3bc63fb1ccc48c6d
parent 54c71521b5295f82aaac7aa2f3ce918298fed70f

Reland "Cleanup transitive includes in the legacy inlines."

This reverts commit 54c71521b5295f82aaac7aa2f3ce918298fed70f.

Bug: None
Test: make checkbuild
Change-Id: Ica6a4f7ecadfcc854160a60a5db1b44ae3b6c821

libc/include/android/legacy_strings_inlines.h

diff --git a/libc/include/android/legacy_strings_inlines.h b/libc/include/android/legacy_strings_inlines.h
index 6679c30..5d63c5a 100644
--- a/libc/include/android/legacy_strings_inlines.h
+++ b/libc/include/android/legacy_strings_inlines.h
@@ -29,16 +29,19 @@
 #ifndef _ANDROID_LEGACY_STRINGS_INLINES_H_
 #define _ANDROID_LEGACY_STRINGS_INLINES_H_
 
-#include <strings.h>
 #include <sys/cdefs.h>
 
+#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__
+
+#include <strings.h>
+
 __BEGIN_DECLS
 
-#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__
 /* Everyone except x86 had ffs since the beginning. */
 static __inline int ffs(int __n) { return __builtin_ffs(__n); }
-#endif
 
 __END_DECLS
 
 #endif
+
+#endif