commit 54c71521b5295f82aaac7aa2f3ce918298fed70f
author Joachim Sauer <jsauer@google.com> Thu Jan 18 11:37:34 2018 +0000
committer Joachim Sauer <jsauer@google.com> Thu Jan 18 11:37:34 2018 +0000
tree 1789fb1df0c8befc8a678f3704d6f11445acfdd4
parent a074ac79d7ac0be5537a8a5bcc1ac15c57d4c22b

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

This reverts commit a074ac79d7ac0be5537a8a5bcc1ac15c57d4c22b.

Reason for revert: Broke several builds.

Change-Id: I406f0b0aa0c37961ad031d2f6c5ea4241f3f1111

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_ */