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_errno_inlines.h b/libc/include/android/legacy_errno_inlines.h
index 9f116fa..8f08074 100644
--- a/libc/include/android/legacy_errno_inlines.h
+++ b/libc/include/android/legacy_errno_inlines.h
@@ -29,12 +29,11 @@
#ifndef _ANDROID_LEGACY_ERRNO_INLINES_H
#define _ANDROID_LEGACY_ERRNO_INLINES_H
+#include <errno.h>
#include <sys/cdefs.h>
#if __ANDROID_API__ < __ANDROID_API_L__
-#include <errno.h>
-
__BEGIN_DECLS
static __inline int __attribute__((deprecated)) __set_errno(int n) {
diff --git a/libc/include/android/legacy_fenv_inlines_arm.h b/libc/include/android/legacy_fenv_inlines_arm.h
index f5b2828..58c49c2 100644
--- a/libc/include/android/legacy_fenv_inlines_arm.h
+++ b/libc/include/android/legacy_fenv_inlines_arm.h
@@ -29,12 +29,10 @@
#ifndef ANDROID_LEGACY_FENV_INLINES_ARM_H
#define ANDROID_LEGACY_FENV_INLINES_ARM_H
-#include <sys/cdefs.h>
+#include <fenv.h>
#if __ANDROID_API__ < __ANDROID_API_L__ && defined(__arm__)
-#include <fenv.h>
-
__BEGIN_DECLS
#define FPSCR_ENABLE_SHIFT 8
diff --git a/libc/include/android/legacy_fenv_inlines_mips.h b/libc/include/android/legacy_fenv_inlines_mips.h
index 43ad360..10b93c0 100644
--- a/libc/include/android/legacy_fenv_inlines_mips.h
+++ b/libc/include/android/legacy_fenv_inlines_mips.h
@@ -29,12 +29,10 @@
#ifndef ANDROID_LEGACY_FENV_INLINES_MIPS_H
#define ANDROID_LEGACY_FENV_INLINES_MIPS_H
-#include <sys/cdefs.h>
+#include <fenv.h>
#if __ANDROID_API__ < __ANDROID_API_L__ && (defined(__mips__) && !defined(__LP64__))
-#include <fenv.h>
-
__BEGIN_DECLS
#define FCSR_CAUSE_SHIFT 10
diff --git a/libc/include/android/legacy_signal_inlines.h b/libc/include/android/legacy_signal_inlines.h
index 44c2f4f..4d474b0 100644
--- a/libc/include/android/legacy_signal_inlines.h
+++ b/libc/include/android/legacy_signal_inlines.h
@@ -29,16 +29,16 @@
#ifndef _ANDROID_LEGACY_SIGNAL_INLINES_H_
#define _ANDROID_LEGACY_SIGNAL_INLINES_H_
-#include <sys/cdefs.h>
-
-#if __ANDROID_API__ < __ANDROID_API_L__
-
#include <errno.h>
#include <signal.h>
#include <string.h>
+#include <sys/cdefs.h>
+
__BEGIN_DECLS
+#if __ANDROID_API__ < __ANDROID_API_L__
+
sighandler_t bsd_signal(int __signal, sighandler_t __handler) __REMOVED_IN(21);
/* These weren't introduced until L. */
@@ -117,8 +117,8 @@
return bsd_signal(s, f);
}
-__END_DECLS
-
#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
+__END_DECLS
+
#endif /* _ANDROID_LEGACY_SIGNAL_INLINES_H_ */
diff --git a/libc/include/android/legacy_stdlib_inlines.h b/libc/include/android/legacy_stdlib_inlines.h
index 34a968c..e26e5f2 100644
--- a/libc/include/android/legacy_stdlib_inlines.h
+++ b/libc/include/android/legacy_stdlib_inlines.h
@@ -29,13 +29,12 @@
#ifndef _ANDROID_LEGACY_STDLIB_INLINES_H_
#define _ANDROID_LEGACY_STDLIB_INLINES_H_
-#include <sys/cdefs.h>
-
-#if __ANDROID_API__ < __ANDROID_API_L__
-
#include <errno.h>
#include <float.h>
#include <stdlib.h>
+#include <sys/cdefs.h>
+
+#if __ANDROID_API__ < __ANDROID_API_L__
__BEGIN_DECLS
diff --git a/libc/include/android/legacy_strings_inlines.h b/libc/include/android/legacy_strings_inlines.h
index 5d63c5a..6679c30 100644
--- a/libc/include/android/legacy_strings_inlines.h
+++ b/libc/include/android/legacy_strings_inlines.h
@@ -29,19 +29,16 @@
#ifndef _ANDROID_LEGACY_STRINGS_INLINES_H_
#define _ANDROID_LEGACY_STRINGS_INLINES_H_
-#include <sys/cdefs.h>
-
-#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__
-
#include <strings.h>
+#include <sys/cdefs.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
diff --git a/libc/include/android/legacy_sys_mman_inlines.h b/libc/include/android/legacy_sys_mman_inlines.h
index 160e6fe..7eb537e 100644
--- a/libc/include/android/legacy_sys_mman_inlines.h
+++ b/libc/include/android/legacy_sys_mman_inlines.h
@@ -29,13 +29,12 @@
#pragma once
#include <sys/cdefs.h>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <unistd.h>
#if __ANDROID_API__ < __ANDROID_API_L__
-#include <errno.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
__BEGIN_DECLS
/*
diff --git a/libc/include/android/legacy_sys_stat_inlines.h b/libc/include/android/legacy_sys_stat_inlines.h
index 9521694..bbf54c0 100644
--- a/libc/include/android/legacy_sys_stat_inlines.h
+++ b/libc/include/android/legacy_sys_stat_inlines.h
@@ -30,11 +30,10 @@
#define _ANDROID_LEGACY_SYS_STAT_INLINES_H_
#include <sys/cdefs.h>
+#include <sys/stat.h>
#if __ANDROID_API__ < __ANDROID_API_L__
-#include <sys/stat.h>
-
__BEGIN_DECLS
static __inline int mkfifo(const char* __path, mode_t __mode) {
diff --git a/libc/include/android/legacy_sys_wait_inlines.h b/libc/include/android/legacy_sys_wait_inlines.h
index 4298d76..1124f8e 100644
--- a/libc/include/android/legacy_sys_wait_inlines.h
+++ b/libc/include/android/legacy_sys_wait_inlines.h
@@ -30,13 +30,12 @@
#define _ANDROID_LEGACY_SYS_WAIT_INLINES_H_
#include <sys/cdefs.h>
-
-#if __ANDROID_API__ < __ANDROID_API_J_MR2__
-
#include <sys/syscall.h>
#include <sys/wait.h>
#include <unistd.h>
+#if __ANDROID_API__ < __ANDROID_API_J_MR2__
+
__BEGIN_DECLS
static __inline pid_t wait4(pid_t pid, int* status, int options, struct rusage* rusage) {
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_ */