| commit | 9cb8639b18bc90dab461b4709607083301c9f6fc | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Tue Oct 17 08:41:23 2017 +0000 |
| committer | Orion Hodson <oth@google.com> | Tue Oct 17 08:41:23 2017 +0000 |
| tree | 36a2c69a6fdca4c4da71da08cfc08e5e4cfcf395 | |
| parent | 43df953502c9615781e73ac3cc0db2a711a86998 [diff] [blame] |
Revert "Cleanup transitive includes in the legacy inlines." This reverts commit 43df953502c9615781e73ac3cc0db2a711a86998. Reason for revert: Breaks most AOSP builds. https://android-build.googleplex.com/builds/branch-dashboard/aosp-master?build_id=4399910 Change-Id: I53459f97b7dffb1f7f602db03893564dd3cfe6bf
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_ */