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_termios_inlines.h

diff --git a/libc/include/android/legacy_termios_inlines.h b/libc/include/android/legacy_termios_inlines.h
index 4ed56f0..a63dba1 100644
--- a/libc/include/android/legacy_termios_inlines.h
+++ b/libc/include/android/legacy_termios_inlines.h
@@ -30,14 +30,16 @@
 #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_ */