commit b37e9aa9a63b7b703b5a03347555b1df9ac98ab3
author Dan Albert <danalbert@google.com> Tue Oct 24 09:20:41 2017 +0000
committer Dan Albert <danalbert@google.com> Tue Oct 24 09:20:41 2017 +0000
tree f4c6b8cfb9794b0cc5ee56034280cd194ca5e327
parent f945fb6b8a09d08be89b1b771b20d7291baab659

Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines."""

This reverts commit f945fb6b8a09d08be89b1b771b20d7291baab659.

Reason for revert: haven't fixed all the builds yet

Change-Id: I55aff5d0290c27691427d91a8e46ae01c87da6b2

libc/include/android/legacy_termios_inlines.h

diff --git a/libc/include/android/legacy_termios_inlines.h b/libc/include/android/legacy_termios_inlines.h
index a63dba1..4ed56f0 100644
--- a/libc/include/android/legacy_termios_inlines.h
+++ b/libc/include/android/legacy_termios_inlines.h
@@ -30,16 +30,14 @@
 #define _ANDROID_LEGACY_TERMIOS_INLINES_H_
 
 #include <sys/cdefs.h>
-
-#if __ANDROID_API__ < __ANDROID_API_L__
-
-#include <linux/termios.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
+#include <linux/termios.h>
+
+#if __ANDROID_API__ < __ANDROID_API_L__
 #define __BIONIC_TERMIOS_INLINE static __inline
 #include <bits/termios_inlines.h>
-
 #endif
 
 #endif /* _ANDROID_LEGACY_TERMIOS_INLINES_H_ */